Apex Mobile

完成了工具菜单的挂接

Apex Mobile/Apex Mobile.xcodeproj/project.xcworkspace/xcuserdata/Ray.xcuserdatad/IDEFindNavigatorScopes.plist

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<array/>
+</plist>

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 = "538297237.276861"
+            timestampString = "538975719.864561"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "544"
@@ -90,11 +90,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "Apex Mobile/StaticModelistViewController.m"
-            timestampString = "538737828.834673"
+            timestampString = "538973650.107618"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "65"
-            endingLineNumber = "65"
+            startingLineNumber = "68"
+            endingLineNumber = "68"
             landmarkName = "-tableView:numberOfRowsInSection:"
             landmarkType = "7">
          </BreakpointContent>
@@ -106,12 +106,28 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "Apex Mobile/ToolslistViewController.m"
-            timestampString = "538713952.0064059"
+            timestampString = "538975719.864925"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "72"
-            endingLineNumber = "72"
-            landmarkName = "-LoadModelist"
+            startingLineNumber = "76"
+            endingLineNumber = "76"
+            landmarkName = "ToolslistViewController"
+            landmarkType = "3">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "Apex Mobile/ToolslistViewController.m"
+            timestampString = "538975719.865057"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "113"
+            endingLineNumber = "113"
+            landmarkName = "-PerformAction:"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>

Apex Mobile/Apex Mobile/Base.lproj/Main_iPhone.storyboard

@@ -701,7 +701,7 @@
                 </tableViewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="dgB-U9-z4r" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="-61" y="142"/>
+            <point key="canvasLocation" x="32" y="341"/>
         </scene>
         <!--DatePickerViewController-->
         <scene sceneID="Wdt-sY-7LT">
@@ -1713,7 +1713,7 @@
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="3qq-4t-Ow8" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="-190" y="-1067"/>
+            <point key="canvasLocation" x="-266" y="-1434"/>
         </scene>
         <!--About-->
         <scene sceneID="yPV-LT-kUD">

Apex Mobile/Apex Mobile/DetailPageViewController.m

@@ -143,7 +143,7 @@
             bool autologin =[defaults boolForKey:@"autologin"];
             if(!autologin)
             {
-                TabBarController * viewController =[self.storyboard instantiateViewControllerWithIdentifier:@"LoginTabBar"];
+                TabBarController * viewController =[[UIStoryboard storyboardWithName:@"Main" bundle:nil] instantiateViewControllerWithIdentifier:@"LoginTabBar"];
                 [self presentViewController:viewController animated:YES completion:^{
                     
                 }];
@@ -204,7 +204,7 @@
     NSString* str = request.URL.absoluteString;
     if([str isEqualToString:@"about:blank"])
         return true;
-    WebViewController *ViewController = [self.storyboard instantiateViewControllerWithIdentifier:@"WebViewController"];
+    WebViewController *ViewController = [[UIStoryboard storyboardWithName:@"Main" bundle:nil] instantiateViewControllerWithIdentifier:@"WebViewController"];
     ViewController.url = str;
     //    ViewController. = self.function_name;
     //    ViewController.behavior =BEHAVIOR_SEARCH;

Apex Mobile/Apex Mobile/DocumentsViewController.m

@@ -113,7 +113,7 @@
 - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
 {
     
-    //    SearchViewController *searchViewController = [self.storyboard instantiateViewControllerWithIdentifier:@"NewsView"];
+    //    SearchViewController *searchViewController = [[UIStoryboard storyboardWithName:@"Main" bundle:nil] instantiateViewControllerWithIdentifier:@"NewsView"];
     //    searchViewController.function_name = @"Download Document";
     //    [self.navigationController pushViewController:searchViewController animated:YES];
     //    return;
@@ -121,13 +121,13 @@
     NSString* title = [self.toolsinfo[indexPath.row] valueForKey:@"title"];
     if([title isEqualToString:@"Search documents"])
     {
-        SearchViewController *searchViewController = [self.storyboard instantiateViewControllerWithIdentifier:@"SearchViewController"];
+        SearchViewController *searchViewController = [[UIStoryboard storyboardWithName:@"Main" bundle:nil] instantiateViewControllerWithIdentifier:@"SearchViewController"];
         searchViewController.function_name = @"Download Document";
         [self.navigationController pushViewController:searchViewController animated:YES];
     }
     else if([title isEqualToString:@"View document"])
     {
-        LocalDocumentsViewController *viewcontroller=[self.storyboard instantiateViewControllerWithIdentifier:@"LocalDocumentsViewController"];
+        LocalDocumentsViewController *viewcontroller=[[UIStoryboard storyboardWithName:@"Main" bundle:nil] instantiateViewControllerWithIdentifier:@"LocalDocumentsViewController"];
 //        viewcontroller.module_name = @"Announcements";
         [self.navigationController pushViewController:viewcontroller animated:YES];
     }

Apex Mobile/Apex Mobile/FunctionSelectViewController.m

@@ -49,7 +49,7 @@
             break;
     }
     
-    SearchViewController *searchViewController = [self.storyboard instantiateViewControllerWithIdentifier:@"SearchViewController"];
+    SearchViewController *searchViewController = [[UIStoryboard storyboardWithName:@"Main" bundle:nil] instantiateViewControllerWithIdentifier:@"SearchViewController"];
     searchViewController.function_name = function_name;
     [self.navigationController pushViewController:searchViewController animated:YES];
     
@@ -61,14 +61,14 @@
 }
 - (IBAction)onToolsClick:(UIButton *)sender {
     
-    ToolsPanelViewController *toolsViewController = [self.storyboard instantiateViewControllerWithIdentifier:@"ToolsPanel"];
+    ToolsPanelViewController *toolsViewController = [[UIStoryboard storyboardWithName:@"Main" bundle:nil] instantiateViewControllerWithIdentifier:@"ToolsPanel"];
     toolsViewController.showNavigation = true;
     [self.navigationController pushViewController:toolsViewController animated:YES];
     
 }
 - (IBAction)OnDocumentClick:(UIButton *)sender {
     
-    DocumentsViewController *documentsViewController = [self.storyboard instantiateViewControllerWithIdentifier:@"DocumentsViewController"];
+    DocumentsViewController *documentsViewController = [[UIStoryboard storyboardWithName:@"Main" bundle:nil] instantiateViewControllerWithIdentifier:@"DocumentsViewController"];
 //    toolsViewController.showNavigation = true;
     [self.navigationController pushViewController:documentsViewController animated:YES];
 }

Apex Mobile/Apex Mobile/HistoryViewController.m

@@ -104,7 +104,7 @@
 - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
 {
     
-    ResultViewController *resultViewController = [self.storyboard instantiateViewControllerWithIdentifier:@"ResultViewController"];
+    ResultViewController *resultViewController = [[UIStoryboard storyboardWithName:@"Main" bundle:nil] instantiateViewControllerWithIdentifier:@"ResultViewController"];
     
     resultViewController.function_name = [self.data.pagedata[indexPath.row] valueForKey:@"module_name"];
 

Apex Mobile/Apex Mobile/LocalDocumentsViewController.m

@@ -168,14 +168,14 @@
 //    
 //    
 //    
-//    PdfViewController *ViewController = [self.storyboard instantiateViewControllerWithIdentifier:@"PdfViewController"];
+//    PdfViewController *ViewController = [[UIStoryboard storyboardWithName:@"Main" bundle:nil] instantiateViewControllerWithIdentifier:@"PdfViewController"];
 //    ViewController.filepath = filePath;
 //    //    ViewController. = self.function_name;
 //    //    ViewController.behavior =BEHAVIOR_SEARCH;
 //    
 //    [self.navigationController pushViewController:ViewController animated:YES];
     
-    //    SearchViewController *searchViewController = [self.storyboard instantiateViewControllerWithIdentifier:@"NewsView"];
+    //    SearchViewController *searchViewController = [[UIStoryboard storyboardWithName:@"Main" bundle:nil] instantiateViewControllerWithIdentifier:@"NewsView"];
     //    searchViewController.function_name = @"Download Document";
     //    [self.navigationController pushViewController:searchViewController animated:YES];
     //    return;
@@ -183,13 +183,13 @@
 //    NSString* title = [self.toolsinfo[indexPath.row] valueForKey:@"title"];
 //    if([title isEqualToString:@"Search documents"])
 //    {
-//        SearchViewController *searchViewController = [self.storyboard instantiateViewControllerWithIdentifier:@"SearchViewController"];
+//        SearchViewController *searchViewController = [[UIStoryboard storyboardWithName:@"Main" bundle:nil] instantiateViewControllerWithIdentifier:@"SearchViewController"];
 //        searchViewController.function_name = @"Download Document";
 //        [self.navigationController pushViewController:searchViewController animated:YES];
 //    }
 //    else if([title isEqualToString:@"View document"])
 //    {
-//        LocalDocumentsViewController *viewcontroller=[self.storyboard instantiateViewControllerWithIdentifier:@"LocalDocumentsViewController"];
+//        LocalDocumentsViewController *viewcontroller=[[UIStoryboard storyboardWithName:@"Main" bundle:nil] instantiateViewControllerWithIdentifier:@"LocalDocumentsViewController"];
 //        //        viewcontroller.module_name = @"Announcements";
 //        [self.navigationController pushViewController:viewcontroller animated:YES];
 //    }

Apex Mobile/Apex Mobile/LocationViewController.m

@@ -112,7 +112,7 @@ didTapInfoWindowOfMarker:(GMSMarker *)marker
     
     [self addUnknown];
     
-//    LocationDetailViewController *ViewController = [self.storyboard instantiateViewControllerWithIdentifier:@"LocationDetailViewController"];
+//    LocationDetailViewController *ViewController = [[UIStoryboard storyboardWithName:@"Main" bundle:nil] instantiateViewControllerWithIdentifier:@"LocationDetailViewController"];
 //    ViewController.params = self.params;
 //    self.aBNewPersonNav = [[UINavigationController alloc] initWithRootViewController:ViewController] ;
 //    [self presentViewController:self.aBNewPersonNav animated:YES completion:^{

Apex Mobile/Apex Mobile/Main.storyboard

@@ -1,14 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13529" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="YOs-rL-bRV">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="YOs-rL-bRV">
     <device id="retina4_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
         <deployment version="2304" identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13527"/>
-        <capability name="Alignment constraints with different attributes" minToolsVersion="5.1"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/>
+        <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
+    <customFonts key="customFonts">
+        <array key="HelveticaNeue.ttc">
+            <string>HelveticaNeue</string>
+        </array>
+    </customFonts>
     <scenes>
         <!--Navigation Controller-->
         <scene sceneID="n3W-k5-9pt">
@@ -349,9 +354,172 @@
             </objects>
             <point key="canvasLocation" x="657" y="1701"/>
         </scene>
+        <!--About-->
+        <scene sceneID="6bj-4f-XFa">
+            <objects>
+                <viewController storyboardIdentifier="About" useStoryboardIdentifierAsRestorationIdentifier="YES" id="7fk-ll-nfY" customClass="AboutViewController" sceneMemberID="viewController">
+                    <view key="view" contentMode="scaleToFill" id="kYm-r8-x3q">
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                        <subviews>
+                            <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" fixedFrame="YES" scrollEnabled="NO" editable="NO" text="version:
Support:
usairedadt@united-us.net" textAlignment="center" translatesAutoresizingMaskIntoConstraints="NO" id="qjb-87-KPo">
+                                <rect key="frame" x="20" y="65" width="280" height="257"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES"/>
+                                <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
+                                <fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="17"/>
+                                <textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
+                                <dataDetectorType key="dataDetectorTypes" link="YES"/>
+                            </textView>
+                        </subviews>
+                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <viewLayoutGuide key="safeArea" id="qqy-e5-VYs"/>
+                    </view>
+                    <navigationItem key="navigationItem" title="About" id="Fv2-lk-EA8"/>
+                    <nil key="simulatedBottomBarMetrics"/>
+                    <connections>
+                        <outlet property="infoText" destination="qjb-87-KPo" id="fra-QF-rnb"/>
+                    </connections>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="iQj-g2-Vsa" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="2314" y="-1816"/>
+        </scene>
+        <!--Service location-->
+        <scene sceneID="Zcj-YW-YXI">
+            <objects>
+                <viewController storyboardIdentifier="ServiceLocation" automaticallyAdjustsScrollViewInsets="NO" useStoryboardIdentifierAsRestorationIdentifier="YES" id="MgU-E0-egh" customClass="LocationViewController" sceneMemberID="viewController">
+                    <layoutGuides>
+                        <viewControllerLayoutGuide type="top" id="ajE-Xh-Zps"/>
+                        <viewControllerLayoutGuide type="bottom" id="kHM-0E-Dsh"/>
+                    </layoutGuides>
+                    <view key="view" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" id="xU3-mF-FWx">
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                    </view>
+                    <tabBarItem key="tabBarItem" title="Service location" image="map (1)" id="4zB-7i-xln"/>
+                    <toolbarItems/>
+                    <navigationItem key="navigationItem" id="J7G-bi-6QS"/>
+                    <simulatedStatusBarMetrics key="simulatedStatusBarMetrics" statusBarStyle="lightContent"/>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="Lxn-cI-CUK" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="3046" y="-1817"/>
+        </scene>
+        <!--Apex History View Controller-->
+        <scene sceneID="Phm-xr-Ui3">
+            <objects>
+                <viewController storyboardIdentifier="ApexHistory" useStoryboardIdentifierAsRestorationIdentifier="YES" id="0gA-6x-keH" customClass="ApexHistoryViewController" sceneMemberID="viewController">
+                    <layoutGuides>
+                        <viewControllerLayoutGuide type="top" id="qa6-ye-yCI"/>
+                        <viewControllerLayoutGuide type="bottom" id="NRY-LM-qAI"/>
+                    </layoutGuides>
+                    <view key="view" contentMode="scaleToFill" id="Ssf-nl-y6a">
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                        <subviews>
+                            <imageView userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" image="apexlogo-2" translatesAutoresizingMaskIntoConstraints="NO" id="kly-ZP-lFy">
+                                <rect key="frame" x="0.0" y="55" width="320" height="56"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                            </imageView>
+                            <webView contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Abt-ML-WTx">
+                                <rect key="frame" x="0.0" y="100" width="320" height="420"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                <connections>
+                                    <outlet property="delegate" destination="0gA-6x-keH" id="ck1-Fk-zK6"/>
+                                </connections>
+                            </webView>
+                        </subviews>
+                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                    </view>
+                    <connections>
+                        <outlet property="webview" destination="Abt-ML-WTx" id="oxP-nO-FEd"/>
+                    </connections>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="bTE-KE-GIl" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="3809" y="-1818"/>
+        </scene>
+        <!--News View Controller-->
+        <scene sceneID="GNx-XV-zkB">
+            <objects>
+                <viewController storyboardIdentifier="NewsView" useStoryboardIdentifierAsRestorationIdentifier="YES" id="EeD-fP-1oU" customClass="NewsViewController" sceneMemberID="viewController">
+                    <layoutGuides>
+                        <viewControllerLayoutGuide type="top" id="dOx-gi-yfY"/>
+                        <viewControllerLayoutGuide type="bottom" id="2sz-FS-Gr9"/>
+                    </layoutGuides>
+                    <view key="view" contentMode="scaleToFill" id="uxr-eR-WO2">
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                        <subviews>
+                            <tableView hidden="YES" clipsSubviews="YES" contentMode="scaleToFill" fixedFrame="YES" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="65" sectionHeaderHeight="22" sectionFooterHeight="22" translatesAutoresizingMaskIntoConstraints="NO" id="RHV-m7-JCn">
+                                <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+                                <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                                <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                <prototypes>
+                                    <tableViewCell contentMode="scaleToFill" selectionStyle="blue" accessoryType="disclosureIndicator" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="newsitem" rowHeight="65" id="65E-n4-LH6" customClass="NewsTableViewCell">
+                                        <rect key="frame" x="0.0" y="22" width="375" height="65"/>
+                                        <autoresizingMask key="autoresizingMask"/>
+                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="65E-n4-LH6" id="SYB-mj-lbk">
+                                            <rect key="frame" x="0.0" y="0.0" width="342" height="64.5"/>
+                                            <autoresizingMask key="autoresizingMask"/>
+                                            <subviews>
+                                                <imageView autoresizesSubviews="NO" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" image="rect_market_news" translatesAutoresizingMaskIntoConstraints="NO" id="c0R-J8-9uA">
+                                                    <rect key="frame" x="5" y="0.0" width="120" height="65"/>
+                                                    <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                                                </imageView>
+                                                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="Label" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Bkc-WL-mze">
+                                                    <rect key="frame" x="78" y="0.0" width="42" height="21"/>
+                                                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                                    <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                                    <nil key="highlightedColor"/>
+                                                </label>
+                                                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="Label" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="jq7-eQ-ZiX">
+                                                    <rect key="frame" x="78" y="20" width="209" height="44"/>
+                                                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                                    <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                                                    <color key="textColor" red="0.33333334329999997" green="0.33333334329999997" blue="0.33333334329999997" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                                    <nil key="highlightedColor"/>
+                                                </label>
+                                            </subviews>
+                                        </tableViewCellContentView>
+                                        <connections>
+                                            <outlet property="content" destination="jq7-eQ-ZiX" id="M9b-JG-kvz"/>
+                                            <outlet property="image" destination="c0R-J8-9uA" id="HFc-vZ-c4R"/>
+                                            <outlet property="title" destination="Bkc-WL-mze" id="p4p-PC-AKr"/>
+                                        </connections>
+                                    </tableViewCell>
+                                </prototypes>
+                                <sections/>
+                                <connections>
+                                    <outlet property="dataSource" destination="EeD-fP-1oU" id="915-WV-vDQ"/>
+                                    <outlet property="delegate" destination="EeD-fP-1oU" id="9cC-zc-64Z"/>
+                                </connections>
+                            </tableView>
+                            <activityIndicatorView opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" fixedFrame="YES" animating="YES" style="whiteLarge" translatesAutoresizingMaskIntoConstraints="NO" id="Kgw-c0-JVW">
+                                <rect key="frame" x="142" y="265" width="37" height="37"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                <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>
+                    <connections>
+                        <outlet property="mum" destination="Kgw-c0-JVW" id="i34-3X-vc9"/>
+                        <outlet property="tableview" destination="RHV-m7-JCn" id="wRN-oM-63N"/>
+                    </connections>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="wl6-h0-nHg" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="4630" y="-1817"/>
+        </scene>
     </scenes>
     <resources>
         <image name="apexlogo-2" width="129" height="32"/>
+        <image name="map (1)" width="32" height="32"/>
+        <image name="rect_market_news" width="64" height="64"/>
         <image name="tab_history" width="30" height="30"/>
         <image name="tab_home" width="30" height="30"/>
         <image name="tab_login" width="30" height="30"/>

Apex Mobile/Apex Mobile/MessageDetailViewController.m

@@ -123,7 +123,7 @@
             bool autologin =[defaults boolForKey:@"autologin"];
             if(!autologin)
             {
-                TabBarController * viewController =[self.storyboard instantiateViewControllerWithIdentifier:@"LoginTabBar"];
+                TabBarController * viewController =[[UIStoryboard storyboardWithName:@"Main" bundle:nil] instantiateViewControllerWithIdentifier:@"LoginTabBar"];
                 [self presentViewController:viewController animated:YES completion:^{
                     
                 }];
@@ -153,7 +153,7 @@
 //    bool autologin =[defaults boolForKey:@"autologin"];
 //    if(!autologin)
 //    {
-//        TabBarController * viewController =[self.storyboard instantiateViewControllerWithIdentifier:@"LoginTabBar"];
+//        TabBarController * viewController =[[UIStoryboard storyboardWithName:@"Main" bundle:nil] instantiateViewControllerWithIdentifier:@"LoginTabBar"];
 //        [self presentViewController:viewController animated:YES completion:^{
 //            
 //        }];
@@ -225,7 +225,7 @@
     DetailTabBarController *detailViewController=[[DetailTabBarController alloc] init:@"Cargo Tracking" actions:[NSArray arrayWithObjects:@"Tracking",nil] params:params];
     [self.navigationController pushViewController:detailViewController animated:YES];
     
-    //    SearchViewController *searchViewController = [self.storyboard instantiateViewControllerWithIdentifier:@"SearchViewController"];
+    //    SearchViewController *searchViewController = [[UIStoryboard storyboardWithName:@"Main" bundle:nil] instantiateViewControllerWithIdentifier:@"SearchViewController"];
     //    searchViewController.function_name = @"Download Document";
     //    [self.navigationController pushViewController:searchViewController animated:YES];
     //    return;

Apex Mobile/Apex Mobile/MessageViewController.m

@@ -127,7 +127,7 @@
             bool autologin =[defaults boolForKey:@"autologin"];
             if(!autologin)
             {
-                TabBarController * viewController =[self.storyboard instantiateViewControllerWithIdentifier:@"LoginTabBar"];
+                TabBarController * viewController =[[UIStoryboard storyboardWithName:@"Main" bundle:nil] instantiateViewControllerWithIdentifier:@"LoginTabBar"];
                 [self presentViewController:viewController animated:YES completion:^{
                     
                 }];
@@ -235,7 +235,7 @@
                 bool autologin =[defaults boolForKey:@"autologin"];
                 if(!autologin)
                 {
-                    TabBarController * viewController =[self.storyboard instantiateViewControllerWithIdentifier:@"LoginTabBar"];
+                    TabBarController * viewController =[[UIStoryboard storyboardWithName:@"Main" bundle:nil] instantiateViewControllerWithIdentifier:@"LoginTabBar"];
                     [self presentViewController:viewController animated:YES completion:^{
                         
                     }];
@@ -345,7 +345,7 @@
 
 - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
 {
-    MessageDetailViewController * viewController = [self.storyboard instantiateViewControllerWithIdentifier:@"MessageDetailViewController"];
+    MessageDetailViewController * viewController = [[UIStoryboard storyboardWithName:@"Main" bundle:nil] instantiateViewControllerWithIdentifier:@"MessageDetailViewController"];
     NSMutableDictionary *params = [[NSMutableDictionary alloc]init];
     NSString* sid= [self.messageinfo[indexPath.row] valueForKey:@"s_id"];
     NSString* eid= [self.messageinfo[indexPath.row] valueForKey:@"e_id"];
@@ -358,7 +358,7 @@
     
     [self.navigationController pushViewController:viewController animated:YES];
 
-    //    SearchViewController *searchViewController = [self.storyboard instantiateViewControllerWithIdentifier:@"SearchViewController"];
+    //    SearchViewController *searchViewController = [[UIStoryboard storyboardWithName:@"Main" bundle:nil] instantiateViewControllerWithIdentifier:@"SearchViewController"];
     //    searchViewController.function_name = @"Download Document";
     //    [self.navigationController pushViewController:searchViewController animated:YES];
     //    return;

Apex Mobile/Apex Mobile/NewsViewController.m

@@ -246,12 +246,12 @@
 - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
 {
     
-    NewsDetailViewController *viewcontroller=[self.storyboard instantiateViewControllerWithIdentifier:@"NewsDetailViewController"];
+    NewsDetailViewController *viewcontroller=[[UIStoryboard storyboardWithName:@"Main" bundle:nil] instantiateViewControllerWithIdentifier:@"NewsDetailViewController"];
     viewcontroller.title = [self.data.pagedata[indexPath.row] valueForKey:@"title"];;
     viewcontroller.url = [self.data.pagedata[indexPath.row] valueForKey:@"url"];;
     [self.navigationController pushViewController:viewcontroller animated:YES];
     
-    //    SearchViewController *searchViewController = [self.storyboard instantiateViewControllerWithIdentifier:@"SearchViewController"];
+    //    SearchViewController *searchViewController = [[UIStoryboard storyboardWithName:@"Main" bundle:nil] instantiateViewControllerWithIdentifier:@"SearchViewController"];
     //    searchViewController.function_name = @"Download Document";
     //    [self.navigationController pushViewController:searchViewController animated:YES];
     //    return;

Apex Mobile/Apex Mobile/ResultViewController.m

@@ -80,7 +80,7 @@
             bool autologin =[defaults boolForKey:@"autologin"];
             if(!autologin)
             {
-                TabBarController * viewController =[self.storyboard instantiateViewControllerWithIdentifier:@"LoginTabBar"];
+                TabBarController * viewController =[[UIStoryboard storyboardWithName:@"Main" bundle:nil] instantiateViewControllerWithIdentifier:@"LoginTabBar"];
                 [self presentViewController:viewController animated:YES completion:^{
                     
                 }];
@@ -101,7 +101,7 @@
     DetailTabBarController *detailViewController=[[DetailTabBarController alloc] init:self.function_name actions:self.actions params:params];
     
     
-    //        DetailTabBarController *detailViewController = [self.storyboard instantiateViewControllerWithIdentifier:@"DetailTabBarController"];
+    //        DetailTabBarController *detailViewController = [[UIStoryboard storyboardWithName:@"Main" bundle:nil] instantiateViewControllerWithIdentifier:@"DetailTabBarController"];
     //        detailViewController.function_name = self.function_name;
     //        detailViewController.actions = self.actions;
     //        detailViewController.params =params;
@@ -126,7 +126,7 @@
     [pulldownMenu animateDropDown];
     if(indexPath.item==0)
     {
-        CustomizeFieldViewController *ViewController = [self.storyboard instantiateViewControllerWithIdentifier:@"CustomizeFieldViewController"];
+        CustomizeFieldViewController *ViewController = [[UIStoryboard storyboardWithName:@"Main" bundle:nil] instantiateViewControllerWithIdentifier:@"CustomizeFieldViewController"];
         ViewController.function_name = self.function_name;
         ViewController.behavior =BEHAVIOR_RESULT;
         self.dirty=true;
@@ -238,7 +238,7 @@
     //    : CGPointMake(0.0f,self.navigationController.navigationBar.frame.size.height)
     
     [pulldownMenu animateDropDown:CGPointMake(0.0f,self.navigationController.navigationBar.frame.size.height)];
-    //    CustomizeFieldViewController *ViewController = [self.storyboard instantiateViewControllerWithIdentifier:@"CustomizeFieldViewController"];
+    //    CustomizeFieldViewController *ViewController = [[UIStoryboard storyboardWithName:@"Main" bundle:nil] instantiateViewControllerWithIdentifier:@"CustomizeFieldViewController"];
     //    ViewController.function_name = self.function_name;
     //    ViewController.behavior =BEHAVIOR_RESULT;
     //    self.dirty=true;
@@ -251,7 +251,7 @@
 }
 - (void) Tap:(UIView*)view url:(NSString*) url
 {
-    WebViewController *ViewController = [self.storyboard instantiateViewControllerWithIdentifier:@"WebViewController"];
+    WebViewController *ViewController = [[UIStoryboard storyboardWithName:@"Main" bundle:nil] instantiateViewControllerWithIdentifier:@"WebViewController"];
     ViewController.url = url;
     //    ViewController. = self.function_name;
     //    ViewController.behavior =BEHAVIOR_SEARCH;

Apex Mobile/Apex Mobile/RootViewController.m

@@ -29,26 +29,26 @@
     
 //    [UIStoryboard storyboardWithName:@"EnumSelectAndSort" bundle:nil]
     
-    LoginViewController * loginVC = [ self.storyboard instantiateViewControllerWithIdentifier:@"LoginPanel"];
+    LoginViewController * loginVC = [ [UIStoryboard storyboardWithName:@"Main" bundle:nil] instantiateViewControllerWithIdentifier:@"LoginPanel"];
     loginVC.loginSuccessful = ^(void)
     {
       // 登陆成功后重新刷新tabbar
         self.viewControllers = self.loginbar;
     };
 //    loginVC.tabBarItem =  [self itemWithSelectedImage:@"login" image:@"login" title:@"login"];
-//    ToolslistViewController* toolVC = [self.storyboard instantiateViewControllerWithIdentifier:@"ToolsPanel"];
+//    ToolslistViewController* toolVC = [[UIStoryboard storyboardWithName:@"Main" bundle:nil] instantiateViewControllerWithIdentifier:@"ToolsPanel"];
     
     
     ToolslistViewController *toolVC=[[ToolslistViewController alloc] initWithNibName:@"StaticModelistViewController" bundle:nil];
     
-    HomeViewController* homeVC = [self.storyboard instantiateViewControllerWithIdentifier:@"HomePanel"];
+    HomeViewController* homeVC = [[UIStoryboard storyboardWithName:@"Main" bundle:nil] instantiateViewControllerWithIdentifier:@"HomePanel"];
     
     
     SearchlistViewController* searchVC = [[SearchlistViewController alloc] initWithNibName:@"StaticModelistViewController" bundle:nil];
-    //[self.storyboard instantiateViewControllerWithIdentifier:@"SearchPanel"];
+    //[[UIStoryboard storyboardWithName:@"Main" bundle:nil] instantiateViewControllerWithIdentifier:@"SearchPanel"];
     MylistViewController* myVC = [[MylistViewController alloc] initWithNibName:@"StaticModelistViewController" bundle:nil];
-    //[self.storyboard instantiateViewControllerWithIdentifier:@"MyPanel"];
-    OrderHistoryViewController* historyVC = [self.storyboard instantiateViewControllerWithIdentifier:@"HistoryPanel"];
+    //[[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"];
     // Do any additional setup after loading the view.
     

Apex Mobile/Apex Mobile/SearchViewController.m

@@ -114,7 +114,7 @@
 //    [[self view] endEditing:animated];
 //}
 - (IBAction)onCustomize:(UIBarButtonItem *)sender {
-    CustomizeFieldViewController *ViewController = [self.storyboard instantiateViewControllerWithIdentifier:@"CustomizeFieldViewController"];
+    CustomizeFieldViewController *ViewController = [[UIStoryboard storyboardWithName:@"Main" bundle:nil] instantiateViewControllerWithIdentifier:@"CustomizeFieldViewController"];
     ViewController.function_name = self.function_name;
     ViewController.behavior =BEHAVIOR_SEARCH;
     self.dirty = true;
@@ -314,7 +314,7 @@
 
 - (IBAction)SearchBtnOnClick:(UIButton *)sender {
     
-    ResultViewController *resultViewController = [self.storyboard instantiateViewControllerWithIdentifier:@"ResultViewController"];
+    ResultViewController *resultViewController = [[UIStoryboard storyboardWithName:@"Main" bundle:nil] instantiateViewControllerWithIdentifier:@"ResultViewController"];
     resultViewController.function_name = self.function_name;
 //    if([self.function_name isEqualToString:@"Document Download"])
 //        resultViewController.fullrow_select =false;

Apex Mobile/Apex Mobile/StaticModelistViewController.m

@@ -26,7 +26,10 @@
     }
     return self;
 }
-
+-(void)PerformAction:(NSString*) type
+{
+    NSAssert(true, ([NSString stringWithFormat:@"%s PerformAction not impl",object_getClassName([self class])]));
+}
 - (void)viewDidLoad {
     [super viewDidLoad];
     
@@ -139,7 +142,11 @@
 //    return v;
 //}
 - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
-    StaticModeTableViewCell *cell = [tableView cellForRowAtIndexPath:indexPath];
+    NSDictionary* item = self.modelist[indexPath.section];
+    NSString* type = item[@"type"];
+    
+    [self PerformAction:type];
+    
     //    RAModel *model = cell.model;
 //    NSMutableDictionary* modeinfo= cell.modeinfo;
 //

Apex Mobile/Apex Mobile/ToolsPanelViewController.m

@@ -155,7 +155,7 @@
 - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
 {
     
-//    SearchViewController *searchViewController = [self.storyboard instantiateViewControllerWithIdentifier:@"NewsView"];
+//    SearchViewController *searchViewController = [[UIStoryboard storyboardWithName:@"Main" bundle:nil] instantiateViewControllerWithIdentifier:@"NewsView"];
 //    searchViewController.function_name = @"Download Document";
 //    [self.navigationController pushViewController:searchViewController animated:YES];
 //    return;
@@ -163,13 +163,13 @@
     NSString* title = [self.toolsinfo[indexPath.row] valueForKey:@"title"];
     if([title isEqualToString:@"Market news"])
     {
-        NewsViewController *viewcontroller=[self.storyboard instantiateViewControllerWithIdentifier:@"NewsView"];
+        NewsViewController *viewcontroller=[[UIStoryboard storyboardWithName:@"Main" bundle:nil] instantiateViewControllerWithIdentifier:@"NewsView"];
         viewcontroller.module_name = @"Market news";
         [self.navigationController pushViewController:viewcontroller animated:YES];
     }
     else if([title isEqualToString:@"Announcements"])
     {
-        NewsViewController *viewcontroller=[self.storyboard instantiateViewControllerWithIdentifier:@"NewsView"];
+        NewsViewController *viewcontroller=[[UIStoryboard storyboardWithName:@"Main" bundle:nil] instantiateViewControllerWithIdentifier:@"NewsView"];
         viewcontroller.module_name = @"Announcements";
         [self.navigationController pushViewController:viewcontroller animated:YES];
     }
@@ -183,25 +183,25 @@
     }
     else if([title isEqualToString:@"Change Password"])
     {
-        ChangePasswordViewController *viewcontroller=[self.storyboard instantiateViewControllerWithIdentifier:@"ChangePassword"];
+        ChangePasswordViewController *viewcontroller=[[UIStoryboard storyboardWithName:@"Main" bundle:nil] instantiateViewControllerWithIdentifier:@"ChangePassword"];
 //        newsview.module_name = @"Market news";
         [self.navigationController pushViewController:viewcontroller animated:YES];
     }
 //    else if([title isEqualToString:@"Setting"])
 //    {
-//        ChangePasswordViewController *newsview=[self.storyboard instantiateViewControllerWithIdentifier:@"Setting"];
+//        ChangePasswordViewController *newsview=[[UIStoryboard storyboardWithName:@"Main" bundle:nil] instantiateViewControllerWithIdentifier:@"Setting"];
 ////        newsview.module_name = @"Market news";
 //        [self.navigationController pushViewController:newsview animated:YES];
 //    }
     else if([title isEqualToString:@"Apex History"])
     {
-         ApexHistoryViewController *viewcontroller=[self.storyboard instantiateViewControllerWithIdentifier:@"ApexHistory"];
+         ApexHistoryViewController *viewcontroller=[[UIStoryboard storyboardWithName:@"Main" bundle:nil] instantiateViewControllerWithIdentifier:@"ApexHistory"];
 //        newsview.module_name = @"Market news";
         [self.navigationController pushViewController:viewcontroller animated:YES];
     }
     else if([title isEqualToString:@"About this App"])
     {
-        AboutViewController *viewcontroller=[self.storyboard instantiateViewControllerWithIdentifier:@"About"];
+        AboutViewController *viewcontroller=[[UIStoryboard storyboardWithName:@"Main" bundle:nil] instantiateViewControllerWithIdentifier:@"About"];
 //        newsview.module_name = @"Market news";
         [self.navigationController pushViewController:viewcontroller animated:YES];
     }

Apex Mobile/Apex Mobile/ToolslistViewController.m

@@ -7,6 +7,10 @@
 //
 
 #import "ToolslistViewController.h"
+#import "AboutViewController.h"
+#import "NewsViewController.h"
+#import "ApexHistoryViewController.h"
+#import "LocationViewController.h"
 
 @interface ToolslistViewController ()
 
@@ -103,6 +107,84 @@
     self.tabBarItem.image= [UIImage imageNamed:modelistjson[@"icon"]];
     
 //    NSAssert(true, ([NSString stringWithFormat:@"%s LoadModelist not impl",object_getClassName([self class])]));
+}
+-(void)PerformAction:(NSString*) type
+{
+
+    if([type isEqualToString:@"market_news"])
+    {
+                NewsViewController *viewcontroller=[[UIStoryboard storyboardWithName:@"Main" bundle:nil] instantiateViewControllerWithIdentifier:@"NewsView"];
+                viewcontroller.module_name = @"Market news";
+                [self.navigationController pushViewController:viewcontroller animated:YES];
+    }
+    else if([type isEqualToString:@"announcements"])
+    {
+                NewsViewController *viewcontroller=[[UIStoryboard storyboardWithName:@"Main" bundle:nil] instantiateViewControllerWithIdentifier:@"NewsView"];
+                viewcontroller.module_name = @"Announcements";
+                [self.navigationController pushViewController:viewcontroller animated:YES];
+    }
+    else if([type isEqualToString:@"history"])
+    {
+        ApexHistoryViewController *viewcontroller=[[UIStoryboard storyboardWithName:@"Main" bundle:nil] instantiateViewControllerWithIdentifier:@"ApexHistory"];
+        //        newsview.module_name = @"Market news";
+        [self.navigationController pushViewController:viewcontroller animated:YES];
+    }
+    else if([type isEqualToString:@"service_location"])
+    {
+        LocationViewController *viewcontroller=[[UIStoryboard storyboardWithName:@"Main" bundle:nil] instantiateViewControllerWithIdentifier:@"ServiceLocation"];
+        //        newsview.module_name = @"Market news";
+        [self.navigationController pushViewController:viewcontroller animated:YES];
+    }
+    
+    else if([type isEqualToString:@"about"])
+    {
+        AboutViewController *viewcontroller=[[UIStoryboard storyboardWithName:@"Main" bundle:nil] instantiateViewControllerWithIdentifier:@"About"];
+        //        newsview.module_name = @"Market news";
+        [self.navigationController pushViewController:viewcontroller animated:YES];
+    }
+//    
+//    
+//    NSString* title = [self.toolsinfo[indexPath.row] valueForKey:@"title"];
+//    if([title isEqualToString:@"Market news"])
+//    {
+//        NewsViewController *viewcontroller=[[UIStoryboard storyboardWithName:@"Main" bundle:nil] instantiateViewControllerWithIdentifier:@"NewsView"];
+//        viewcontroller.module_name = @"Market news";
+//        [self.navigationController pushViewController:viewcontroller animated:YES];
+//    }
+//    else if([title isEqualToString:@"Announcements"])
+//    {
+//        NewsViewController *viewcontroller=[[UIStoryboard storyboardWithName:@"Main" bundle:nil] instantiateViewControllerWithIdentifier:@"NewsView"];
+//        viewcontroller.module_name = @"Announcements";
+//        [self.navigationController pushViewController:viewcontroller animated:YES];
+//    }
+//    else if([title isEqualToString:@"Saved Detail/Search"])
+//    {
+//        
+//        HistoryTabBarController *viewcontroller=[[HistoryTabBarController alloc] init];
+//        
+//        [self.navigationController pushViewController:viewcontroller animated:YES];
+//        
+//    }
+//    else if([title 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([title isEqualToString:@"Setting"])
+//    //    {
+//    //        ChangePasswordViewController *newsview=[[UIStoryboard storyboardWithName:@"Main" bundle:nil] instantiateViewControllerWithIdentifier:@"Setting"];
+//    ////        newsview.module_name = @"Market news";
+//    //        [self.navigationController pushViewController:newsview animated:YES];
+//    //    }
+//    else if([title isEqualToString:@"Apex History"])
+//    {
+//        ApexHistoryViewController *viewcontroller=[[UIStoryboard storyboardWithName:@"Main" bundle:nil] instantiateViewControllerWithIdentifier:@"ApexHistory"];
+//        //        newsview.module_name = @"Market news";
+//        [self.navigationController pushViewController:viewcontroller animated:YES];
+//    }
+//    else if([title isEqualToString:@"About this App"])
+
 }
 /*
 #pragma mark - Navigation

Apex Mobile/Apex Mobile/tools.json

@@ -5,31 +5,31 @@
                  "name": "Market News",
                  "detail": "View market news",
                  "icon": "mode_news",
-                 "type": "market news"
+                 "type": "market_news"
                  },
                  {
                  "name": "Announcements",
                  "detail": "Public statement by Apex Group",
                  "icon": "mode_announcement",
-                 "type": "market news"
+                 "type": "announcements"
                  },
                  {
                  "name": "Apex History",
                  "detail": "Learn history of Apex Group",
                  "icon": "mode_history",
-                 "type": "market news"
+                 "type": "history"
                  },
                  {
                  "name": "Service Location",
                  "detail": "Find local Apex office",
                  "icon": "mode_service_location",
-                 "type": "service location"
+                 "type": "service_location"
                  },
                  {
                  "name": "About",
                  "detail": "About this app",
                  "icon": "mode_about",
-                 "type": "market news"
+                 "type": "about"
                  }
                  ],
     "title": "Tools",

Apex Mobile/FavoritesViewController.m

@@ -129,7 +129,7 @@
     DetailTabBarController *detailViewController=[[DetailTabBarController alloc] init:function_name actions:actions params:params];
     
     
-    //        DetailTabBarController *detailViewController = [self.storyboard instantiateViewControllerWithIdentifier:@"DetailTabBarController"];
+    //        DetailTabBarController *detailViewController = [[UIStoryboard storyboardWithName:@"Main" bundle:nil] instantiateViewControllerWithIdentifier:@"DetailTabBarController"];
     //        detailViewController.function_name = self.function_name;
     //        detailViewController.actions = self.actions;
     //        detailViewController.params =params;