Преглед изворни кода

hmlg scan order 1.21, release
Fix bug
Contrast mobile 1.99 test flight
Change security code to 4 digit

Ray Zhang пре 3 година
родитељ
комит
60c4680110

+ 6 - 7
common/customUI/commoneditor/CommonEditor.storyboard

@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="19162" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="20037" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
     <device id="ipad9_7" orientation="portrait" layout="fullscreen" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="19144"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="20020"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
-        <!--Title-->
+        <!--Select Date-->
         <scene sceneID="E5d-Rh-3tk">
             <objects>
-                <viewController storyboardIdentifier="DatePickerViewController" useStoryboardIdentifierAsRestorationIdentifier="YES" id="hDO-yf-YYU" customClass="DatePickerViewController" sceneMemberID="viewController">
+                <viewController storyboardIdentifier="DatePickerViewController" title="Select Date" useStoryboardIdentifierAsRestorationIdentifier="YES" id="hDO-yf-YYU" customClass="DatePickerViewController" sceneMemberID="viewController">
                     <layoutGuides>
                         <viewControllerLayoutGuide type="top" id="oEN-IW-3xG"/>
                         <viewControllerLayoutGuide type="bottom" id="RpF-H7-VSr"/>
@@ -21,7 +21,7 @@
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                         <subviews>
                             <datePicker contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" datePickerMode="dateAndTime" minuteInterval="1" translatesAutoresizingMaskIntoConstraints="NO" id="92Z-Po-m6V">
-                                <rect key="frame" x="0.0" y="93" width="768" height="216"/>
+                                <rect key="frame" x="224" y="93" width="320" height="216"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="216" id="i19-IZ-5lG"/>
                                 </constraints>
@@ -58,9 +58,8 @@
                             <constraint firstItem="cRS-hn-ulf" firstAttribute="leading" secondItem="SzR-aC-W21" secondAttribute="leading" id="CRs-B5-0Jb"/>
                             <constraint firstAttribute="trailing" secondItem="cRS-hn-ulf" secondAttribute="trailing" id="CrK-F6-xZH"/>
                             <constraint firstItem="pXA-kN-pBh" firstAttribute="centerX" secondItem="SzR-aC-W21" secondAttribute="centerX" id="Ner-ft-bgy"/>
-                            <constraint firstAttribute="trailing" secondItem="92Z-Po-m6V" secondAttribute="trailing" id="aHW-du-eY1"/>
                             <constraint firstItem="92Z-Po-m6V" firstAttribute="top" secondItem="cRS-hn-ulf" secondAttribute="bottom" constant="8" id="cDM-Yf-JAV"/>
-                            <constraint firstItem="92Z-Po-m6V" firstAttribute="leading" secondItem="SzR-aC-W21" secondAttribute="leading" id="gW9-ll-PzN"/>
+                            <constraint firstItem="92Z-Po-m6V" firstAttribute="centerX" secondItem="SzR-aC-W21" secondAttribute="centerX" id="l28-uS-zYR"/>
                         </constraints>
                     </view>
                     <navigationItem key="navigationItem" title="Title" id="mup-at-2Ts"/>

+ 4 - 1
common/customUI/commoneditor/CommonEditorViewController.m

@@ -5005,7 +5005,10 @@ if(!self.alert.isBeingDismissed)
         NSString* value =[item_json valueForKey:@"value"];
         if (value==nil || value.length==0)
         {
-            value=@"1/2015";
+            NSDateFormatter* formatter = [[NSDateFormatter alloc] init];
+            formatter.dateFormat = @"MM/yyyy";
+            NSDate *date = [NSDate date];
+            value=[formatter stringFromDate:date];
         }
         //        NSString* type =[item_json valueForKey:@"type"];