Просмотр исходного кода

1.修改iOS Apex Drivers图标。

Pen Li 7 лет назад
Родитель
Сommit
11bb90b3ec
37 измененных файлов с 100 добавлено и 17 удалено
  1. 1 0
      Redant Drivers/Apex And Drivers/Assets.xcassets/action_available.imageset/Contents.json
  2. BIN
      Redant Drivers/Apex And Drivers/Assets.xcassets/action_available.imageset/action_available.png
  3. BIN
      Redant Drivers/Apex And Drivers/Assets.xcassets/action_available.imageset/action_available@2x.png
  4. BIN
      Redant Drivers/Apex And Drivers/Assets.xcassets/action_available.imageset/action_available@3x.png
  5. 23 0
      Redant Drivers/Apex And Drivers/Assets.xcassets/action_message.imageset/Contents.json
  6. BIN
      Redant Drivers/Apex And Drivers/Assets.xcassets/action_message.imageset/action_message.png
  7. BIN
      Redant Drivers/Apex And Drivers/Assets.xcassets/action_message.imageset/action_message@2x.png
  8. BIN
      Redant Drivers/Apex And Drivers/Assets.xcassets/action_message.imageset/action_message@3x.png
  9. 1 0
      Redant Drivers/Apex And Drivers/Assets.xcassets/action_setting.imageset/Contents.json
  10. BIN
      Redant Drivers/Apex And Drivers/Assets.xcassets/action_setting.imageset/action_setting.png
  11. BIN
      Redant Drivers/Apex And Drivers/Assets.xcassets/action_setting.imageset/action_setting@2x.png
  12. BIN
      Redant Drivers/Apex And Drivers/Assets.xcassets/action_setting.imageset/action_setting@3x.png
  13. 1 0
      Redant Drivers/Apex And Drivers/Assets.xcassets/action_signout.imageset/Contents.json
  14. BIN
      Redant Drivers/Apex And Drivers/Assets.xcassets/action_signout.imageset/action_signout.png
  15. BIN
      Redant Drivers/Apex And Drivers/Assets.xcassets/action_signout.imageset/action_signout@2x.png
  16. BIN
      Redant Drivers/Apex And Drivers/Assets.xcassets/action_signout.imageset/action_signout@3x.png
  17. 1 0
      Redant Drivers/Apex And Drivers/Assets.xcassets/action_unavailable.imageset/Contents.json
  18. BIN
      Redant Drivers/Apex And Drivers/Assets.xcassets/action_unavailable.imageset/action_unavailable.png
  19. BIN
      Redant Drivers/Apex And Drivers/Assets.xcassets/action_unavailable.imageset/action_unavailable@2x.png
  20. BIN
      Redant Drivers/Apex And Drivers/Assets.xcassets/action_unavailable.imageset/action_unavailable@3x.png
  21. 23 0
      Redant Drivers/Apex And Drivers/Assets.xcassets/backend_flag.imageset/Contents.json
  22. BIN
      Redant Drivers/Apex And Drivers/Assets.xcassets/backend_flag.imageset/backend_flag.png
  23. BIN
      Redant Drivers/Apex And Drivers/Assets.xcassets/backend_flag.imageset/backend_flag@2x.png
  24. BIN
      Redant Drivers/Apex And Drivers/Assets.xcassets/backend_flag.imageset/backend_flag@3x.png
  25. 23 0
      Redant Drivers/Apex And Drivers/Assets.xcassets/filter.imageset/Contents.json
  26. BIN
      Redant Drivers/Apex And Drivers/Assets.xcassets/filter.imageset/filter.png
  27. BIN
      Redant Drivers/Apex And Drivers/Assets.xcassets/filter.imageset/filter@2x.png
  28. BIN
      Redant Drivers/Apex And Drivers/Assets.xcassets/filter.imageset/filter@3x.png
  29. BIN
      Redant Drivers/Apex And Drivers/Assets.xcassets/upload_list.imageset/upload_list.png
  30. BIN
      Redant Drivers/Apex And Drivers/Assets.xcassets/upload_list.imageset/upload_list@2x.png
  31. BIN
      Redant Drivers/Apex And Drivers/Assets.xcassets/upload_list.imageset/upload_list@3x.png
  32. 2 1
      Redant Drivers/Apex And Drivers/Detail/RAOrderDetailViewController+TableViewDelegate.m
  33. 2 1
      Redant Drivers/Apex And Drivers/Filter/RAOrderFilterViewController+TableDelegate.m
  34. 10 10
      Redant Drivers/Apex And Drivers/Home/HomeHeader.xib
  35. 1 1
      Redant Drivers/Apex And Drivers/Home/More/RAHomeMoreViewController.m
  36. 10 3
      Redant Drivers/Apex And Drivers/Home/RAHomeViewController.m
  37. 2 1
      Redant Drivers/Apex And Drivers/Update/RAOrderEditViewController+TableDelegate.m

+ 1 - 0
Redant Drivers/Apex And Drivers/Assets.xcassets/action_available.imageset/Contents.json

@@ -0,0 +1 @@
+{"images": [{"idiom": "universal", "filename": "action_available.png", "scale": "1x"}, {"idiom": "universal", "filename": "action_available@2x.png", "scale": "2x"}, {"idiom": "universal", "filename": "action_available@3x.png", "scale": "3x"}], "info": {"version": 1, "author": "xcode"}}

BIN
Redant Drivers/Apex And Drivers/Assets.xcassets/action_available.imageset/action_available.png


BIN
Redant Drivers/Apex And Drivers/Assets.xcassets/action_available.imageset/action_available@2x.png


BIN
Redant Drivers/Apex And Drivers/Assets.xcassets/action_available.imageset/action_available@3x.png


+ 23 - 0
Redant Drivers/Apex And Drivers/Assets.xcassets/action_message.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "action_message.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "action_message@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "action_message@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

BIN
Redant Drivers/Apex And Drivers/Assets.xcassets/action_message.imageset/action_message.png


BIN
Redant Drivers/Apex And Drivers/Assets.xcassets/action_message.imageset/action_message@2x.png


BIN
Redant Drivers/Apex And Drivers/Assets.xcassets/action_message.imageset/action_message@3x.png


+ 1 - 0
Redant Drivers/Apex And Drivers/Assets.xcassets/action_setting.imageset/Contents.json

@@ -0,0 +1 @@
+{"images": [{"idiom": "universal", "filename": "action_setting.png", "scale": "1x"}, {"idiom": "universal", "filename": "action_setting@2x.png", "scale": "2x"}, {"idiom": "universal", "filename": "action_setting@3x.png", "scale": "3x"}], "info": {"version": 1, "author": "xcode"}}

BIN
Redant Drivers/Apex And Drivers/Assets.xcassets/action_setting.imageset/action_setting.png


BIN
Redant Drivers/Apex And Drivers/Assets.xcassets/action_setting.imageset/action_setting@2x.png


BIN
Redant Drivers/Apex And Drivers/Assets.xcassets/action_setting.imageset/action_setting@3x.png


+ 1 - 0
Redant Drivers/Apex And Drivers/Assets.xcassets/action_signout.imageset/Contents.json

@@ -0,0 +1 @@
+{"images": [{"idiom": "universal", "filename": "action_signout.png", "scale": "1x"}, {"idiom": "universal", "filename": "action_signout@2x.png", "scale": "2x"}, {"idiom": "universal", "filename": "action_signout@3x.png", "scale": "3x"}], "info": {"version": 1, "author": "xcode"}}

BIN
Redant Drivers/Apex And Drivers/Assets.xcassets/action_signout.imageset/action_signout.png


BIN
Redant Drivers/Apex And Drivers/Assets.xcassets/action_signout.imageset/action_signout@2x.png


BIN
Redant Drivers/Apex And Drivers/Assets.xcassets/action_signout.imageset/action_signout@3x.png


+ 1 - 0
Redant Drivers/Apex And Drivers/Assets.xcassets/action_unavailable.imageset/Contents.json

@@ -0,0 +1 @@
+{"images": [{"idiom": "universal", "filename": "action_unavailable.png", "scale": "1x"}, {"idiom": "universal", "filename": "action_unavailable@2x.png", "scale": "2x"}, {"idiom": "universal", "filename": "action_unavailable@3x.png", "scale": "3x"}], "info": {"version": 1, "author": "xcode"}}

BIN
Redant Drivers/Apex And Drivers/Assets.xcassets/action_unavailable.imageset/action_unavailable.png


BIN
Redant Drivers/Apex And Drivers/Assets.xcassets/action_unavailable.imageset/action_unavailable@2x.png


BIN
Redant Drivers/Apex And Drivers/Assets.xcassets/action_unavailable.imageset/action_unavailable@3x.png


+ 23 - 0
Redant Drivers/Apex And Drivers/Assets.xcassets/backend_flag.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "backend_flag.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "backend_flag@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "backend_flag@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

BIN
Redant Drivers/Apex And Drivers/Assets.xcassets/backend_flag.imageset/backend_flag.png


BIN
Redant Drivers/Apex And Drivers/Assets.xcassets/backend_flag.imageset/backend_flag@2x.png


BIN
Redant Drivers/Apex And Drivers/Assets.xcassets/backend_flag.imageset/backend_flag@3x.png


+ 23 - 0
Redant Drivers/Apex And Drivers/Assets.xcassets/filter.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "filter.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "filter@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "filter@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

BIN
Redant Drivers/Apex And Drivers/Assets.xcassets/filter.imageset/filter.png


BIN
Redant Drivers/Apex And Drivers/Assets.xcassets/filter.imageset/filter@2x.png


BIN
Redant Drivers/Apex And Drivers/Assets.xcassets/filter.imageset/filter@3x.png


BIN
Redant Drivers/Apex And Drivers/Assets.xcassets/upload_list.imageset/upload_list.png


BIN
Redant Drivers/Apex And Drivers/Assets.xcassets/upload_list.imageset/upload_list@2x.png


BIN
Redant Drivers/Apex And Drivers/Assets.xcassets/upload_list.imageset/upload_list@3x.png


+ 2 - 1
Redant Drivers/Apex And Drivers/Detail/RAOrderDetailViewController+TableViewDelegate.m

@@ -28,8 +28,9 @@
 - (UIView *)tableView:(UITableView *)tableView viewForHeaderInSection:(NSInteger)section {
     
     UIView *header = [[UIView alloc] initWithFrame:CGRectMake(0, 0, CGRectGetWidth(tableView.bounds), 44.0f)];
-    header.backgroundColor = [UIColor lightGrayColor];
+    header.backgroundColor = ApexDriverGrayColor;
     UILabel *label = [[UILabel alloc] initWithFrame:CGRectMake(10, 11, CGRectGetWidth(tableView.bounds) - 20, 22)];
+    label.textColor = ApexDriverWhiteColor;
     [header addSubview:label];
     
     label.text = [self titleForSection:section];

+ 2 - 1
Redant Drivers/Apex And Drivers/Filter/RAOrderFilterViewController+TableDelegate.m

@@ -19,9 +19,10 @@
 - (UIView *)tableView:(UITableView *)tableView viewForHeaderInSection:(NSInteger)section {
     
     UIView *header = [[UIView alloc] init];
-    header.backgroundColor = [UIColor colorWithRed:0.8 green:0.8 blue:0.8 alpha:0.8];
+    header.backgroundColor = ApexDriverGrayColor;
     
     UILabel *titleLB = [[UILabel alloc] initWithFrame:CGRectMake(5, 5, CGRectGetWidth(tableView.bounds) - 11, 30)];
+    titleLB.textColor = ApexDriverWhiteColor;
     titleLB.text = [self sectionModelForSection:section].title;
     
     [header addSubview:titleLB];

+ 10 - 10
Redant Drivers/Apex And Drivers/Home/HomeHeader.xib

@@ -92,7 +92,7 @@
                                         <constraint firstAttribute="height" constant="40" id="4Sr-1p-bEQ"/>
                                         <constraint firstAttribute="width" constant="40" id="gv7-gD-7iB"/>
                                     </constraints>
-                                    <state key="normal" image="signout.png"/>
+                                    <state key="normal" image="action_signout"/>
                                     <connections>
                                         <action selector="signoutBtnClick:" destination="CmN-WL-UzN" eventType="touchUpInside" id="X1D-gl-Zqf"/>
                                     </connections>
@@ -117,7 +117,7 @@
                                 </label>
                                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="vJn-m4-oEg">
                                     <rect key="frame" x="58" y="19" width="40" height="40"/>
-                                    <state key="normal" image="setting.png"/>
+                                    <state key="normal" image="action_setting"/>
                                     <connections>
                                         <action selector="settingBtnClick:" destination="CmN-WL-UzN" eventType="touchUpInside" id="Z0b-02-8mY"/>
                                     </connections>
@@ -139,8 +139,8 @@
                                 </label>
                                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="zav-l2-wiC">
                                     <rect key="frame" x="58" y="19" width="40" height="40"/>
-                                    <state key="normal" image="available.png"/>
-                                    <state key="selected" image="unavailable.png"/>
+                                    <state key="normal" image="action_available"/>
+                                    <state key="selected" image="action_unavailable"/>
                                     <connections>
                                         <action selector="availableBtnClick:" destination="CmN-WL-UzN" eventType="touchUpInside" id="8u5-0b-SlC"/>
                                     </connections>
@@ -162,7 +162,7 @@
                                 </label>
                                 <button opaque="NO" contentMode="scaleAspectFit" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="g4U-M8-oMo">
                                     <rect key="frame" x="58.5" y="19" width="40" height="40"/>
-                                    <state key="normal" image="message.png"/>
+                                    <state key="normal" image="action_message"/>
                                     <state key="selected" image="new_message.png"/>
                                     <connections>
                                         <action selector="messageBtnClick:" destination="CmN-WL-UzN" eventType="touchUpInside" id="rtb-6D-QVQ"/>
@@ -343,11 +343,11 @@
         </view>
     </objects>
     <resources>
-        <image name="available.png" width="48" height="48"/>
-        <image name="message.png" width="48" height="48"/>
+        <image name="action_available" width="40" height="40"/>
+        <image name="action_message" width="40" height="40"/>
+        <image name="action_setting" width="40" height="40"/>
+        <image name="action_signout" width="40" height="40"/>
+        <image name="action_unavailable" width="40" height="40"/>
         <image name="new_message.png" width="48" height="48"/>
-        <image name="setting.png" width="48" height="48"/>
-        <image name="signout.png" width="48" height="48"/>
-        <image name="unavailable.png" width="48" height="48"/>
     </resources>
 </document>

+ 1 - 1
Redant Drivers/Apex And Drivers/Home/More/RAHomeMoreViewController.m

@@ -67,7 +67,7 @@ typedef enum {
 
 - (void)configureNavigationBar {
     
-    UIBarButtonItem *filterItem = [[UIBarButtonItem alloc] initWithImage:[[UIImage imageNamed:@"Filter"] imageWithRenderingMode:UIImageRenderingModeAutomatic]
+    UIBarButtonItem *filterItem = [[UIBarButtonItem alloc] initWithImage:[[UIImage imageNamed:@"filter"] imageWithRenderingMode:UIImageRenderingModeAutomatic]
                                                                    style:UIBarButtonItemStylePlain
                                                                   target:self
                                                                   action:@selector(filterItemClick:)];

+ 10 - 3
Redant Drivers/Apex And Drivers/Home/RAHomeViewController.m

@@ -308,15 +308,22 @@
             if (weakSelf) {
                 __strong typeof(weakSelf) strongSelf = weakSelf;
                 
+                // header
+                BOOL driverAvailable = [[json objectForKey:@"driver_available"] boolValue];
+                strongSelf.headerView.availabel = driverAvailable;
+                NSInteger newCount = [[json objectForKey:@"new_count"] integerValue];
+                NSInteger processingCount = [[json objectForKey:@"processing_count"] integerValue];
+                NSInteger finishCount = [[json objectForKey:@"finish_count"] integerValue];
+                strongSelf.headerView.NewOrderCount = newCount;
+                strongSelf.headerView.ProcessingOrderCount = processingCount;
+                strongSelf.headerView.FinishOrderCount = finishCount;
+                
                 int result = [[json objectForKey:@"result"] intValue];
                 if (result == RESULT_TRUE) {
                     
                     BOOL requiredLocation = [[json objectForKey:@"requiredLocation"] boolValue];
                     [RASingleton sharedInstance].requiredLocation = requiredLocation;
                     
-                    BOOL driverAvailable = [[json objectForKey:@"driver_available"] boolValue];
-                    strongSelf.headerView.availabel = driverAvailable;
-                    
                     NSArray *sectionArray = [json objectForKey:@"sections"];
                     
                     NSMutableArray *tmpSectionArr = [NSMutableArray array];

+ 2 - 1
Redant Drivers/Apex And Drivers/Update/RAOrderEditViewController+TableDelegate.m

@@ -21,8 +21,9 @@
 - (UIView *)tableView:(UITableView *)tableView viewForHeaderInSection:(NSInteger)section {
     
     UIView *header = [[UIView alloc] initWithFrame:CGRectMake(0, 0, CGRectGetWidth(tableView.bounds), 44.0f)];
-    header.backgroundColor = [UIColor lightGrayColor];
+    header.backgroundColor = ApexDriverGrayColor;
     UILabel *label = [[UILabel alloc] initWithFrame:CGRectMake(10, 11, CGRectGetWidth(tableView.bounds) - 20, 22)];
+    label.textColor = ApexDriverWhiteColor;
     [header addSubview:label];
     
     label.text = [self titleForSection:section];