Эх сурвалжийг харах

161202
order list segment add appearance control

Ray Zhang 9 жил өмнө
parent
commit
c55b591916

BIN
RedAnt ERP Mobile/RedAnt ERP Mobile.xcworkspace/xcuserdata/Ray.xcuserdatad/UserInterfaceState.xcuserstate


+ 66 - 2
RedAnt ERP Mobile/RedAnt ERP Mobile.xcworkspace/xcuserdata/Ray.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -502,7 +502,7 @@
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
-            shouldBeEnabled = "Yes"
+            shouldBeEnabled = "No"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/order/OrderListViewController.m"
@@ -527,7 +527,7 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "1564"
             endingLineNumber = "1564"
-            landmarkName = "-tableView:canEditRowAtIndexPath:"
+            landmarkName = "-tableView:editActionsForRowAtIndexPath:"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
@@ -595,5 +595,69 @@
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/Functions/DefaultAppearance.m"
+            timestampString = "502352357.933352"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "101"
+            endingLineNumber = "101"
+            landmarkName = "+get_appearance:container:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/Functions/DefaultAppearance.m"
+            timestampString = "502352370.404742"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "113"
+            endingLineNumber = "113"
+            landmarkName = "+get_appearance:container:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/Functions/DefaultAppearance.m"
+            timestampString = "502352400.328959"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "238"
+            endingLineNumber = "238"
+            landmarkName = "+appearance_function:function:value:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/Functions/modelDetail/DetailViewController.m"
+            timestampString = "502352778.327363"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "946"
+            endingLineNumber = "946"
+            landmarkName = "-tableView:cellForRowAtIndexPath:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
    </Breakpoints>
 </Bucket>

+ 11 - 0
RedAnt ERP Mobile/common/Functions/DefaultAppearance.m

@@ -108,6 +108,17 @@
             return [UIButton appearanceWhenContainedIn: arr_container[0], nil];
         }
     }
+    if([control isEqualToString:@"UISegmentedControl"])
+    {
+        if(container_json==nil)
+            return [UISegmentedControl appearance];
+        else
+        {
+            NSArray* arr_container = [self appearance_container:container_json];
+            return [UISegmentedControl appearanceWhenContainedIn: arr_container[0], nil];
+        }
+    }
+    
     else if([control isEqualToString:@"BundleDetailButton"])
     {
         if(container_json==nil)

+ 11 - 3
RedAnt ERP Mobile/iSales-NPD/default_appearance.json

@@ -180,9 +180,9 @@
         },
         "group_4": {
             "name": "order",
-            "count": 1,
+            "count": 2,
             "item_0": {
-                "note": "order list action 按钮",
+                "note": "order list action button",
                 "control": "UIButton",
                 "function": "setTitleColor.Normal",
                 "value": "0xffffff",
@@ -191,6 +191,14 @@
                     "count": 1,
                     "item_0": "OrderListTableViewCell"
                 }
+            },
+            "item_1":{
+                "note": "order list segment control ",
+                "control": "UISegmentedControl",
+                "function": "TintColor",
+                "value": "0x996633",
+                "info": "NPD BROWN"
+
             }
         },
         "group_5": {
@@ -241,4 +249,4 @@
         }
     },
     "name": "NPD DEFAULT"
-}
+}