Ver código fonte

Apex Mobile
修改状态单元格,显示导航条。

Ray Zhang 8 anos atrás
pai
commit
155454e7b3

+ 2 - 0
Apex Mobile/Apex Mobile.xcodeproj/project.pbxproj

@@ -1220,6 +1220,7 @@
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
 				DEVELOPMENT_TEAM = "";
+				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					/xcode_workspace/ERPSuiteIOS/Apex,
@@ -1255,6 +1256,7 @@
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
 				DEVELOPMENT_TEAM = "";
+				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					/xcode_workspace/ERPSuiteIOS/Apex,

BIN
Apex Mobile/Apex Mobile.xcodeproj/project.xcworkspace/xcuserdata/Ray.xcuserdatad/UserInterfaceState.xcuserstate


+ 1 - 1
Apex Mobile/Apex Mobile.xcodeproj/xcuserdata/Ray.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -90,7 +90,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "Apex Mobile/StaticModelistViewController.m"
-            timestampString = "538732747.720801"
+            timestampString = "538737828.834673"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "65"

+ 2 - 2
Apex Mobile/Apex Mobile/Main.storyboard

@@ -1,11 +1,11 @@
 <?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" useSafeAreas="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" useSafeAreas="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"/>
+        <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>

+ 1 - 1
Apex Mobile/Apex Mobile/RootViewController.m

@@ -25,7 +25,7 @@
     [super viewDidLoad];
     
 //    self.navigationItem.navi
-     [self.navigationController setNavigationBarHidden:YES animated:YES];
+//     [self.navigationController setNavigationBarHidden:YES animated:YES];
     
 //    [UIStoryboard storyboardWithName:@"EnumSelectAndSort" bundle:nil]
     

+ 8 - 2
Apex Mobile/Apex Mobile/ShipingStatusCell.m

@@ -7,7 +7,7 @@
 //
 
 #import "ShipingStatusCell.h"
-
+#import "Constant.h"
 
 @interface ShipingStatusCell ()
 
@@ -27,6 +27,9 @@
 
 - (void)awakeFromNib {
     [super awakeFromNib];
+    
+    self.iconView.tintColor=UIColorFromRGB(0x1e7ffb);
+
     // Initialization code
 }
 
@@ -93,8 +96,11 @@
 //        self.iconView.image = nil;
 //    }
 
+    
+    
+//        cell.imageView.image = ;
     if (icon) {
-        self.iconView.image = [UIImage imageNamed:icon];
+        self.iconView.image = [[UIImage imageNamed:icon] imageWithRenderingMode:UIImageRenderingModeAlwaysTemplate];//[UIImage imageNamed:icon];
     } else {
         self.iconView.image = nil;
     }

+ 1 - 1
RedAnt ERP Mobile/iSales-NPD/iSales-NPD-Info.plist

@@ -21,7 +21,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>171225</string>
+	<string>180129</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSRequiresIPhoneOS</key>