HMLG SCAN ORDER

UPDATE MODEL LIST UI

RedAnt ERP Mobile/HMLG Scan Order/SO.storyboard

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="21701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="22505" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="ipad10_2" orientation="portrait" layout="fullscreen" appearance="light"/>
     <dependencies>
         <deployment version="5696" identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21678"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22504"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -155,20 +155,20 @@
                                 <rect key="frame" x="10" y="50.5" width="546" height="500.5"/>
                                 <prototypes>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" restorationIdentifier="StockTableViewCell" insetsLayoutMarginsFromSafeArea="NO" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="StockTableViewCell" id="cCT-oh-Vaw" customClass="StockTableViewCell">
-                                        <rect key="frame" x="0.0" y="50" width="546" height="43.5"/>
+                                        <rect key="frame" x="0.0" y="50" width="546" height="44.5"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="cCT-oh-Vaw" id="H4K-HT-ycL">
-                                            <rect key="frame" x="0.0" y="0.0" width="546" height="43.5"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="546" height="44.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="MODEL" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Ztx-qv-ZYJ">
-                                                    <rect key="frame" x="16" y="11.5" width="131" height="20.5"/>
+                                                    <rect key="frame" x="16" y="12" width="131" height="20.5"/>
                                                     <fontDescription key="fontDescription" type="boldSystem" pointSize="17"/>
                                                     <nil key="textColor"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="ETD" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Uak-UG-HYK">
-                                                    <rect key="frame" x="187" y="12" width="96" height="19.5"/>
+                                                    <rect key="frame" x="187" y="12.5" width="96" height="19.5"/>
                                                     <constraints>
                                                         <constraint firstAttribute="width" constant="96" id="CXF-TE-lvU"/>
                                                     </constraints>
@@ -177,7 +177,7 @@
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="QTY" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="e7Z-1N-Xb1">
-                                                    <rect key="frame" x="323" y="12" width="42" height="19.5"/>
+                                                    <rect key="frame" x="323" y="12.5" width="42" height="19.5"/>
                                                     <constraints>
                                                         <constraint firstAttribute="width" constant="42" id="1Nc-3Q-pnz"/>
                                                     </constraints>
@@ -186,7 +186,7 @@
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="bzB-Zs-Ggl">
-                                                    <rect key="frame" x="385" y="4.5" width="145" height="34.5"/>
+                                                    <rect key="frame" x="385" y="5" width="145" height="34.5"/>
                                                     <constraints>
                                                         <constraint firstAttribute="width" constant="145" id="XtK-g7-iX0"/>
                                                     </constraints>
@@ -437,7 +437,7 @@
                         <rect key="frame" x="0.0" y="0.0" width="810" height="1080"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="-1" estimatedSectionHeaderHeight="-1" sectionFooterHeight="-1" estimatedSectionFooterHeight="-1" translatesAutoresizingMaskIntoConstraints="NO" id="aHE-X4-VOt">
+                            <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="none" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="-1" estimatedSectionHeaderHeight="-1" sectionFooterHeight="-1" estimatedSectionFooterHeight="-1" translatesAutoresizingMaskIntoConstraints="NO" id="aHE-X4-VOt">
                                 <rect key="frame" x="15" y="67" width="780" height="998"/>
                                 <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                                 <prototypes>
@@ -734,15 +734,25 @@ line 3</string>
                                                     <nil key="textColor"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
+                                                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="lDs-CT-R5C" userLabel="bottom line">
+                                                    <rect key="frame" x="0.0" y="164" width="780" height="2"/>
+                                                    <color key="backgroundColor" systemColor="systemGrayColor"/>
+                                                    <constraints>
+                                                        <constraint firstAttribute="height" constant="2" id="VUG-wE-NsD"/>
+                                                    </constraints>
+                                                </view>
                                             </subviews>
                                             <constraints>
                                                 <constraint firstAttribute="trailing" secondItem="qoy-vW-xRS" secondAttribute="trailing" constant="15" id="0N9-nj-8aK"/>
                                                 <constraint firstItem="Pyr-9z-nFr" firstAttribute="height" secondItem="ybo-Ex-ZSL" secondAttribute="height" id="219-Ca-b6P"/>
+                                                <constraint firstAttribute="trailing" secondItem="lDs-CT-R5C" secondAttribute="trailing" id="4hT-KB-sw8"/>
                                                 <constraint firstItem="bh0-td-ws6" firstAttribute="centerY" secondItem="ybo-Ex-ZSL" secondAttribute="centerY" id="5et-e0-MeZ"/>
                                                 <constraint firstAttribute="trailing" secondItem="Gl3-BN-9JK" secondAttribute="trailing" constant="16" id="6AC-6C-oeu"/>
                                                 <constraint firstItem="kwx-rV-AXC" firstAttribute="height" secondItem="ybo-Ex-ZSL" secondAttribute="height" id="6Qe-jE-RMu"/>
                                                 <constraint firstItem="ZgQ-DK-Xnp" firstAttribute="top" secondItem="qoy-vW-xRS" secondAttribute="bottom" constant="4" id="7kG-TP-8Np"/>
+                                                <constraint firstItem="lDs-CT-R5C" firstAttribute="leading" secondItem="exp-Hy-y0g" secondAttribute="leading" id="8Fq-d0-Sfb"/>
                                                 <constraint firstItem="JzP-1G-jcR" firstAttribute="top" secondItem="7Cf-ao-6dF" secondAttribute="top" id="8bg-Kk-zh5"/>
+                                                <constraint firstAttribute="bottom" secondItem="lDs-CT-R5C" secondAttribute="bottom" id="9Wa-30-D0m"/>
                                                 <constraint firstItem="xLb-sH-DDc" firstAttribute="top" secondItem="7Cf-ao-6dF" secondAttribute="top" id="9bF-pH-ksg"/>
                                                 <constraint firstItem="826-Bv-Afw" firstAttribute="height" secondItem="7Cf-ao-6dF" secondAttribute="height" id="9qz-Yc-L2Z"/>
                                                 <constraint firstItem="Pyr-9z-nFr" firstAttribute="leading" secondItem="2me-vx-6M3" secondAttribute="trailing" id="AIo-VQ-V3O"/>
@@ -915,7 +925,7 @@ line 3</string>
                                 <nil key="textColor"/>
                                 <nil key="highlightedColor"/>
                             </label>
-                            <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="-1" estimatedSectionHeaderHeight="-1" sectionFooterHeight="-1" estimatedSectionFooterHeight="-1" translatesAutoresizingMaskIntoConstraints="NO" id="bW9-lh-e8E">
+                            <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="none" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="-1" estimatedSectionHeaderHeight="-1" sectionFooterHeight="-1" estimatedSectionFooterHeight="-1" translatesAutoresizingMaskIntoConstraints="NO" id="bW9-lh-e8E">
                                 <rect key="frame" x="15" y="67" width="780" height="918.5"/>
                                 <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                                 <prototypes>
@@ -1220,9 +1230,17 @@ line 3</string>
                                                     <nil key="textColor"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
+                                                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Zys-QN-184" userLabel="bottom line">
+                                                    <rect key="frame" x="0.0" y="164" width="780" height="2"/>
+                                                    <color key="backgroundColor" systemColor="systemGrayColor"/>
+                                                    <constraints>
+                                                        <constraint firstAttribute="height" constant="2" id="Kir-lD-neX"/>
+                                                    </constraints>
+                                                </view>
                                             </subviews>
                                             <constraints>
                                                 <constraint firstItem="dpT-CT-Ret" firstAttribute="height" secondItem="AK1-ap-AfF" secondAttribute="height" id="04f-dU-ROg"/>
+                                                <constraint firstAttribute="trailing" secondItem="Zys-QN-184" secondAttribute="trailing" id="0WJ-x2-E30"/>
                                                 <constraint firstItem="Z2Y-LD-RFG" firstAttribute="top" secondItem="Ajw-zF-nXf" secondAttribute="top" constant="13" id="1u2-sR-u0X"/>
                                                 <constraint firstItem="oVz-hr-vFh" firstAttribute="centerY" secondItem="Z2Y-LD-RFG" secondAttribute="centerY" id="2Cc-48-asa"/>
                                                 <constraint firstItem="6jj-I8-3Vs" firstAttribute="height" secondItem="AK1-ap-AfF" secondAttribute="height" id="3TU-H1-8vw"/>
@@ -1240,6 +1258,7 @@ line 3</string>
                                                 <constraint firstItem="4MP-XW-NEm" firstAttribute="width" secondItem="ygm-0i-NY3" secondAttribute="width" id="BVm-Cz-Dxe"/>
                                                 <constraint firstItem="dcE-Le-QMW" firstAttribute="height" secondItem="AK1-ap-AfF" secondAttribute="height" id="Be7-dQ-xAV"/>
                                                 <constraint firstAttribute="trailing" secondItem="4MP-XW-NEm" secondAttribute="trailing" constant="16" id="CW8-UG-ujQ"/>
+                                                <constraint firstItem="Zys-QN-184" firstAttribute="leading" secondItem="Ajw-zF-nXf" secondAttribute="leading" id="DR1-Dy-wrD"/>
                                                 <constraint firstItem="4MP-XW-NEm" firstAttribute="height" secondItem="AK1-ap-AfF" secondAttribute="height" id="EnZ-HX-tye"/>
                                                 <constraint firstItem="Nnj-5b-sBF" firstAttribute="trailing" secondItem="Ajw-zF-nXf" secondAttribute="trailingMargin" id="HQH-Bw-1Rb"/>
                                                 <constraint firstItem="pMY-tU-GDI" firstAttribute="height" secondItem="AK1-ap-AfF" secondAttribute="height" id="Hae-sG-sj9"/>
@@ -1307,6 +1326,7 @@ line 3</string>
                                                 <constraint firstItem="pMY-tU-GDI" firstAttribute="leading" secondItem="1kO-eZ-rr3" secondAttribute="trailing" id="tRR-Bh-Cu3"/>
                                                 <constraint firstItem="bVe-RI-TAM" firstAttribute="leading" secondItem="dpT-CT-Ret" secondAttribute="trailing" id="umv-BW-uAb"/>
                                                 <constraint firstItem="NfL-2K-HAE" firstAttribute="height" secondItem="AK1-ap-AfF" secondAttribute="height" id="xGf-YJ-qUO"/>
+                                                <constraint firstAttribute="bottom" secondItem="Zys-QN-184" secondAttribute="bottom" id="xcU-0r-0oF"/>
                                                 <constraint firstItem="AK1-ap-AfF" firstAttribute="leading" secondItem="Ajw-zF-nXf" secondAttribute="leading" constant="16" id="ySk-Qs-VCV"/>
                                                 <constraint firstItem="9hH-Br-ZKJ" firstAttribute="height" secondItem="AK1-ap-AfF" secondAttribute="height" id="z3y-Ch-THL"/>
                                             </constraints>
@@ -2157,7 +2177,7 @@ Stock</string>
                         <rect key="frame" x="0.0" y="0.0" width="810" height="1080"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="-1" estimatedSectionHeaderHeight="-1" sectionFooterHeight="-1" estimatedSectionFooterHeight="-1" translatesAutoresizingMaskIntoConstraints="NO" id="Zxn-QV-WBs">
+                            <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="none" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="-1" estimatedSectionHeaderHeight="-1" sectionFooterHeight="-1" estimatedSectionFooterHeight="-1" translatesAutoresizingMaskIntoConstraints="NO" id="Zxn-QV-WBs">
                                 <rect key="frame" x="0.0" y="64" width="810" height="1016"/>
                                 <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                                 <prototypes>
@@ -2453,6 +2473,13 @@ line 3</string>
                                                     <nil key="textColor"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
+                                                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Qpi-vL-Zo9" userLabel="bottom line">
+                                                    <rect key="frame" x="0.0" y="164" width="810" height="2"/>
+                                                    <color key="backgroundColor" systemColor="systemGrayColor"/>
+                                                    <constraints>
+                                                        <constraint firstAttribute="height" constant="2" id="cgm-ea-XuX"/>
+                                                    </constraints>
+                                                </view>
                                             </subviews>
                                             <constraints>
                                                 <constraint firstItem="rL8-9w-zqg" firstAttribute="leading" secondItem="ToU-Mo-Rx3" secondAttribute="leading" id="0Eg-8G-CwM"/>
@@ -2480,6 +2507,7 @@ line 3</string>
                                                 <constraint firstAttribute="trailing" secondItem="LEh-OL-gzO" secondAttribute="trailing" constant="16" id="HfR-Cw-wP1"/>
                                                 <constraint firstItem="TEW-3R-q3j" firstAttribute="top" secondItem="P0q-Yt-GXv" secondAttribute="top" id="IDk-xT-nod"/>
                                                 <constraint firstItem="Ua7-Qu-TE2" firstAttribute="height" secondItem="P0q-Yt-GXv" secondAttribute="height" id="JUq-4I-DCn"/>
+                                                <constraint firstAttribute="bottom" secondItem="Qpi-vL-Zo9" secondAttribute="bottom" id="Jg4-ge-Odt"/>
                                                 <constraint firstItem="qux-TP-f6L" firstAttribute="centerY" secondItem="rL8-9w-zqg" secondAttribute="centerY" id="K0k-Lg-qaO"/>
                                                 <constraint firstItem="qux-TP-f6L" firstAttribute="width" secondItem="rL8-9w-zqg" secondAttribute="width" id="KBF-iC-HgH"/>
                                                 <constraint firstItem="CZn-lW-zFb" firstAttribute="width" secondItem="rL8-9w-zqg" secondAttribute="width" id="KHX-G1-Xk9"/>
@@ -2494,6 +2522,7 @@ line 3</string>
                                                 <constraint firstItem="P0q-Yt-GXv" firstAttribute="top" secondItem="rL8-9w-zqg" secondAttribute="bottom" id="SMS-0E-NZU"/>
                                                 <constraint firstItem="Fgw-LJ-KR5" firstAttribute="top" secondItem="P0q-Yt-GXv" secondAttribute="top" id="T4c-AL-El7"/>
                                                 <constraint firstItem="qLh-8g-4bz" firstAttribute="leading" secondItem="P0q-Yt-GXv" secondAttribute="trailing" id="TJl-9o-SEn"/>
+                                                <constraint firstItem="Qpi-vL-Zo9" firstAttribute="leading" secondItem="h6v-P5-Y6J" secondAttribute="leading" id="UJk-sg-ofv"/>
                                                 <constraint firstItem="P0q-Yt-GXv" firstAttribute="leading" secondItem="rL8-9w-zqg" secondAttribute="leading" id="UWC-z1-Ln9"/>
                                                 <constraint firstItem="51Y-wy-2ET" firstAttribute="width" secondItem="rL8-9w-zqg" secondAttribute="width" id="VY5-j0-3Gd"/>
                                                 <constraint firstItem="CZn-lW-zFb" firstAttribute="height" secondItem="rL8-9w-zqg" secondAttribute="height" id="Vrp-1L-mgj"/>
@@ -2514,6 +2543,7 @@ line 3</string>
                                                 <constraint firstItem="Fgw-LJ-KR5" firstAttribute="height" secondItem="P0q-Yt-GXv" secondAttribute="height" id="fb2-hx-RoW"/>
                                                 <constraint firstItem="dPf-p7-b3A" firstAttribute="width" secondItem="P0q-Yt-GXv" secondAttribute="width" id="gko-un-oWF"/>
                                                 <constraint firstItem="H92-P3-tCf" firstAttribute="leading" secondItem="ToU-Mo-Rx3" secondAttribute="leading" id="hSy-MA-lRZ"/>
+                                                <constraint firstAttribute="trailing" secondItem="Qpi-vL-Zo9" secondAttribute="trailing" id="i8c-Yg-Qyb"/>
                                                 <constraint firstItem="dPf-p7-b3A" firstAttribute="height" secondItem="P0q-Yt-GXv" secondAttribute="height" id="iJg-7n-INN"/>
                                                 <constraint firstItem="56k-bL-ui2" firstAttribute="leading" secondItem="Raa-F8-Tim" secondAttribute="trailing" id="ikf-1J-Hsd"/>
                                                 <constraint firstItem="ToU-Mo-Rx3" firstAttribute="leading" secondItem="h6v-P5-Y6J" secondAttribute="leading" constant="16" id="kXQ-AV-Tkp"/>
@@ -2742,10 +2772,10 @@ line 3</string>
                                 <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                                 <prototypes>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="cell" id="hO3-NR-b05">
-                                        <rect key="frame" x="0.0" y="50" width="810" height="43.5"/>
+                                        <rect key="frame" x="0.0" y="50" width="810" height="44.5"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="hO3-NR-b05" id="jg4-JD-jFQ">
-                                            <rect key="frame" x="0.0" y="0.0" width="810" height="43.5"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="810" height="44.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                         </tableViewCellContentView>
                                     </tableViewCell>
@@ -2783,10 +2813,10 @@ line 3</string>
                                 <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                                 <prototypes>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="cell" id="k1t-dv-O2g">
-                                        <rect key="frame" x="0.0" y="50" width="810" height="43.5"/>
+                                        <rect key="frame" x="0.0" y="50" width="810" height="44.5"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="k1t-dv-O2g" id="JR5-7G-JCb">
-                                            <rect key="frame" x="0.0" y="0.0" width="810" height="43.5"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="810" height="44.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                         </tableViewCellContentView>
                                     </tableViewCell>
@@ -2823,5 +2853,8 @@ line 3</string>
         <systemColor name="systemBackgroundColor">
             <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
         </systemColor>
+        <systemColor name="systemGrayColor">
+            <color red="0.55686274509803924" green="0.55686274509803924" blue="0.57647058823529407" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+        </systemColor>
     </resources>
 </document>

RedAnt ERP Mobile/HMLG Scan Order/ScanSearchViewController.m

@@ -115,6 +115,9 @@
     self.tableview.layer.shadowRadius = 2.0;
     
     
+    //2024.3
+    self.tableview.separatorColor = UIColor.blackColor;
+    
     
     
     //刷新
@@ -248,6 +251,11 @@
         cell = [[ScanListCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:@"ScanListCell"];
     }
 
+        
+        if ([cell respondsToSelector:@selector(setSeparatorInset:)]) {
+            [cell setSeparatorInset:UIEdgeInsetsMake(1, 0, 50, 0)];
+        }
+        
     NSMutableArray* arr = self.modellist;
     
     [cell setModelJson:arr[indexPath.row]];

RedAnt ERP Mobile/HMLG Scan Order/config.h

@@ -17,7 +17,7 @@
 #define RA_NOTIFICATION
 
 # ifdef DEBUG
-#define test_server
+//#define test_server
 # endif
 
 #define exception_switch 1

RedAnt ERP Mobile/common/AutoScrollImage/CycleScrollView.m

@@ -18,6 +18,8 @@
 @property (nonatomic , strong) NSMutableArray *contentViews;
 @property (nonatomic , strong) UIScrollView *scrollView;
 
+@property (nonatomic , strong) UIImageView *videoMarker;
+
 @property (nonatomic , weak) NSTimer *animationTimer;
 @property (nonatomic , assign) NSTimeInterval animationDuration;
 @property (nonatomic , strong) UIPageControl *pageControl;

RedAnt ERP Mobile/common/AutoScrollImage/CycleScrollViewPlus.h

@@ -0,0 +1,17 @@
+//
+//  CycleScrollViewPlus.h
+//  iShop
+//
+//  Created by Rui Zhang on 1/9/24.
+//
+
+#import <UIKit/UIKit.h>
+#import "CycleScrollView.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface CycleScrollViewPlus : CycleScrollView
+
+@end
+
+NS_ASSUME_NONNULL_END

RedAnt ERP Mobile/common/AutoScrollImage/CycleScrollViewPlus.m

@@ -0,0 +1,20 @@
+//
+//  CycleScrollViewPlus.m
+//  iShop
+//
+//  Created by Rui Zhang on 1/9/24.
+//
+
+#import "CycleScrollViewPlus.h"
+
+@implementation CycleScrollViewPlus
+
+/*
+// Only override drawRect: if you perform custom drawing.
+// An empty implementation adversely affects performance during animation.
+- (void)drawRect:(CGRect)rect {
+    // Drawing code
+}
+*/
+
+@end

RedAnt ERP Mobile/common/ERP_Mobile_Model.storyboard

@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="15705" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="22505" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="ipad9_7" orientation="portrait" layout="fullscreen" appearance="light"/>
     <dependencies>
-        <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15706"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22504"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -17,16 +16,16 @@
                         <viewControllerLayoutGuide type="bottom" id="EX0-db-c9r"/>
                     </layoutGuides>
                     <view key="view" contentMode="scaleToFill" id="ejn-gg-nd0">
-                        <rect key="frame" x="0.0" y="0.0" width="540" height="620"/>
+                        <rect key="frame" x="0.0" y="0.0" width="540" height="600"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="REb-Km-86b">
-                                <rect key="frame" x="0.0" y="0.0" width="540" height="620"/>
+                                <rect key="frame" x="0.0" y="0.0" width="540" height="600"/>
                                 <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <color key="sectionIndexBackgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <prototypes>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="BundleModelCell" id="dB5-XO-0k0" customClass="BundleModelCell">
-                                        <rect key="frame" x="0.0" y="28" width="540" height="44"/>
+                                        <rect key="frame" x="0.0" y="50" width="540" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="dB5-XO-0k0" id="hHK-ed-J9v">
                                             <rect key="frame" x="0.0" y="0.0" width="540" height="44"/>
@@ -98,6 +97,7 @@
                                 </connections>
                             </tableView>
                         </subviews>
+                        <viewLayoutGuide key="safeArea" id="NjR-mi-6hE"/>
                         <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <constraints>
                             <constraint firstItem="REb-Km-86b" firstAttribute="trailing" secondItem="NjR-mi-6hE" secondAttribute="trailing" id="51b-Z1-TYO"/>
@@ -105,7 +105,6 @@
                             <constraint firstItem="REb-Km-86b" firstAttribute="top" secondItem="ejn-gg-nd0" secondAttribute="top" id="o96-vd-TuB"/>
                             <constraint firstAttribute="bottom" secondItem="REb-Km-86b" secondAttribute="bottom" id="oSj-dG-MCh"/>
                         </constraints>
-                        <viewLayoutGuide key="safeArea" id="NjR-mi-6hE"/>
                     </view>
                     <modalFormSheetSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
                     <connections>
@@ -156,7 +155,7 @@
                                                     <color key="pageIndicatorTintColor" white="0.66666666669999997" alpha="1" colorSpace="calibratedWhite"/>
                                                     <color key="currentPageIndicatorTintColor" red="0.33333333329999998" green="0.33333333329999998" blue="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                 </pageControl>
-                                                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="9Mu-qp-RSA">
+                                                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="9Mu-qp-RSA">
                                                     <rect key="frame" x="440" y="134" width="273" height="75"/>
                                                     <constraints>
                                                         <constraint firstAttribute="width" constant="273" id="O38-WI-Rld"/>
@@ -267,7 +266,7 @@
                                                         <action selector="introduceBtnClick:" destination="kAQ-Xf-rNs" eventType="touchUpInside" id="MQa-MJ-Uot"/>
                                                     </connections>
                                                 </button>
-                                                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="zZd-gk-D61">
+                                                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="zZd-gk-D61">
                                                     <rect key="frame" x="35" y="510" width="100" height="30"/>
                                                     <constraints>
                                                         <constraint firstAttribute="width" constant="100" id="RPM-f6-u2d"/>
@@ -461,12 +460,12 @@
                                                     <rect key="frame" x="0.0" y="0.0" width="768" height="550"/>
                                                     <subviews>
                                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Video player will show here" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="tl8-vS-NmX" userLabel="Video player will be there">
-                                                            <rect key="frame" x="199.5" y="256" width="369.5" height="38.5"/>
+                                                            <rect key="frame" x="199" y="256" width="370" height="38.5"/>
                                                             <fontDescription key="fontDescription" type="system" pointSize="32"/>
                                                             <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                                             <nil key="highlightedColor"/>
                                                         </label>
-                                                        <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="nFW-fj-XiU">
+                                                        <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="nFW-fj-XiU">
                                                             <rect key="frame" x="701" y="8" width="67" height="45"/>
                                                             <constraints>
                                                                 <constraint firstAttribute="height" constant="45" id="VHX-hm-rwt"/>
@@ -498,7 +497,7 @@
                                                         <action selector="create_HangTag:" destination="kAQ-Xf-rNs" eventType="touchUpInside" id="3Rh-kr-h0I"/>
                                                     </connections>
                                                 </button>
-                                                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="9dN-Nj-HVI">
+                                                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="9dN-Nj-HVI">
                                                     <rect key="frame" x="520" y="100" width="193" height="26"/>
                                                     <connections>
                                                         <action selector="noLoginBtnClick:" destination="kAQ-Xf-rNs" eventType="touchUpInside" id="T8K-JI-GEY"/>
@@ -634,7 +633,7 @@
                                             <outlet property="ytplayerView" destination="UAx-tO-OLn" id="HkF-s2-pfN"/>
                                         </connections>
                                     </tableViewCell>
-                                    <tableViewCell contentMode="scaleToFill" restorationIdentifier="DetailTopicCell" selectionStyle="default" indentationWidth="10" reuseIdentifier="DetailTopicCell" translatesAutoresizingMaskIntoConstraints="NO" id="GbB-7z-HP1" customClass="DetailTopicCell">
+                                    <tableViewCell contentMode="scaleToFill" restorationIdentifier="DetailTopicCell" selectionStyle="default" indentationWidth="10" reuseIdentifier="DetailTopicCell" rowHeight="600" translatesAutoresizingMaskIntoConstraints="NO" id="GbB-7z-HP1" customClass="DetailTopicCell">
                                         <rect key="frame" x="0.0" y="605.5" width="768" height="600"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="GbB-7z-HP1" id="7d6-QM-cCK">
@@ -738,7 +737,7 @@
                                     <tableViewCell contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="DetailInfoCell" rowHeight="44" id="m5c-yo-teZ" customClass="DetailKVCell">
                                         <rect key="frame" x="0.0" y="1805.5" width="768" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
-                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="m5c-yo-teZ" translatesAutoresizingMaskIntoConstraints="NO" id="9Go-8e-NvY">
+                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" ambiguous="YES" tableViewCell="m5c-yo-teZ" translatesAutoresizingMaskIntoConstraints="NO" id="9Go-8e-NvY">
                                             <rect key="frame" x="0.0" y="0.0" width="768" height="44"/>
                                             <subviews>
                                                 <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="01N-MT-7ec">
@@ -773,7 +772,7 @@
                                 </connections>
                             </tableView>
                             <label hidden="YES" opaque="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Cannot get data from server.
Tap to try again." textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Z5X-Tk-7lQ">
-                                <rect key="frame" x="262" y="489.5" width="244" height="45.5"/>
+                                <rect key="frame" x="263.5" y="489.5" width="241.5" height="45.5"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="19"/>
                                 <color key="textColor" red="0.33333333329999998" green="0.33333333329999998" blue="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <nil key="highlightedColor"/>
@@ -783,6 +782,7 @@
                                 <color key="color" red="0.59999999999999998" green="0.40000000000000002" blue="0.20000000000000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                             </activityIndicatorView>
                         </subviews>
+                        <viewLayoutGuide key="safeArea" id="tLK-l6-IIH"/>
                         <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <constraints>
                             <constraint firstItem="Z5X-Tk-7lQ" firstAttribute="centerX" secondItem="Yx8-lp-iyF" secondAttribute="centerX" id="476-2h-SNG"/>
@@ -794,7 +794,6 @@
                             <constraint firstItem="Z5X-Tk-7lQ" firstAttribute="centerY" secondItem="Yx8-lp-iyF" secondAttribute="centerY" id="iaa-1B-WhG"/>
                             <constraint firstItem="gac-eh-pxs" firstAttribute="leading" secondItem="tLK-l6-IIH" secondAttribute="leading" id="wc3-s4-QLK"/>
                         </constraints>
-                        <viewLayoutGuide key="safeArea" id="tLK-l6-IIH"/>
                     </view>
                     <connections>
                         <outlet property="detailTable" destination="gac-eh-pxs" id="BKY-IU-IYX"/>

RedAnt ERP Mobile/common/ERP_Mobile_Search.storyboard

@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="19529" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="22505" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="ipad9_7" orientation="portrait" layout="fullscreen" appearance="light"/>
     <dependencies>
-        <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="19519"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22504"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>

RedAnt ERP Mobile/common/Functions/modelDetail/DetailViewController.m

@@ -40,7 +40,7 @@
 
 #define  DEF_CELL_HEIGHT 44
 #define  DEF_TABLE_HEIGHT 44
-#define  LINE_WIDTH 0
+#define  LINE_WIDTH 10
 #define  CELL_MARGIN 0
 #define  LABEL_MARGIN 10
 
@@ -1020,11 +1020,17 @@ dispatch_async(dispatch_get_main_queue(), ^{
             [rtlabel setLineBreakMode: RTTextLineBreakModeWordWrapping];
             //        rtlabel.lineSpacing = 20.0;
             [rtlabel setText: val];
+            rtlabel.font = [UIFont systemFontOfSize:17.0];
             CGSize sizeval=rtlabel.optimumSize;
             
             
+            
+            
+            rtlabel.text = key;
+            CGSize sizekey =rtlabel.optimumSize;
+            
 //            CGSize sizekey = [key sizeWithFont:[UIFont systemFontOfSize:17.0] constrainedToSize:constraintkey lineBreakMode:NSLineBreakByWordWrapping];
-            CGSize sizekey = [RAUtils sizeWithFont:key font:[UIFont systemFontOfSize:17.0] constrainedToSize:constraintkey lineBreakMode:NSLineBreakByWordWrapping];
+//            CGSize sizekey = [RAUtils sizeWithFont:key font:[UIFont systemFontOfSize:17.0] constrainedToSize:constraintkey lineBreakMode:NSLineBreakByWordWrapping];
             
             //           CGSize sizeval = [val sizeWithFont:[UIFont systemFontOfSize:17.0] constrainedToSize:constraintval lineBreakMode:NSLineBreakByWordWrapping];
             float height = MAX(sizekey.height,sizeval.height);
@@ -1095,14 +1101,22 @@ dispatch_async(dispatch_get_main_queue(), ^{
                 [rtlabel setLineBreakMode: RTTextLineBreakModeWordWrapping];
                 //        rtlabel.lineSpacing = 20.0;
                 [rtlabel setText: val];
+                rtlabel.font = [UIFont systemFontOfSize:17.0];
+                
                 CGSize sizeval=rtlabel.optimumSize;
                 
                 
 //                CGSize sizekey = [key sizeWithFont:[UIFont systemFontOfSize:17.0] constrainedToSize:constraintkey lineBreakMode:NSLineBreakByWordWrapping];
                 
-                CGSize sizekey = [RAUtils sizeWithFont:key font:[UIFont systemFontOfSize:17.0] constrainedToSize:constraintkey lineBreakMode:NSLineBreakByWordWrapping];
+//                CGSize sizekey = [RAUtils sizeWithFont:key font:[UIFont systemFontOfSize:17.0] constrainedToSize:constraintkey lineBreakMode:NSLineBreakByWordWrapping];
                 
                 //           CGSize sizeval = [val sizeWithFont:[UIFont systemFontOfSize:17.0] constrainedToSize:constraintval lineBreakMode:NSLineBreakByWordWrapping];
+                
+                
+                
+                rtlabel.text = key;
+                CGSize sizekey =rtlabel.optimumSize;
+    
                 float height = MAX(sizekey.height,sizeval.height);
                 height = MAX(height+LINE_WIDTH, DEF_CELL_HEIGHT);
                 
@@ -2044,12 +2058,18 @@ dispatch_async(dispatch_get_main_queue(), ^{
             frame.origin.y=0;
             RTLabel* rtlabel = [[RTLabel alloc] initWithFrame:frame];
             [rtlabel setLineBreakMode: RTTextLineBreakModeWordWrapping];
+            rtlabel.font=[UIFont systemFontOfSize:17.0];
+            
             //        rtlabel.lineSpacing = 20.0;
             [rtlabel setText: val];
             CGSize sizeval=rtlabel.optimumSize;
 //            CGSize sizekey = [key sizeWithFont:[UIFont systemFontOfSize:17.0] constrainedToSize:constraintkey lineBreakMode:NSLineBreakByWordWrapping];
             
-            CGSize sizekey = [RAUtils sizeWithFont:key font:[UIFont systemFontOfSize:17.0] constrainedToSize:constraintkey lineBreakMode:NSLineBreakByWordWrapping];
+            
+            rtlabel.text = key;
+            CGSize sizekey =rtlabel.optimumSize;
+            
+//            CGSize sizekey = [RAUtils sizeWithFont:key font:[UIFont systemFontOfSize:17.0] constrainedToSize:constraintkey lineBreakMode:NSLineBreakByWordWrapping];
             
             float height = MAX(sizekey.height,sizeval.height);
             height = MAX(height, DEF_CELL_HEIGHT-LINE_WIDTH);
@@ -2058,6 +2078,8 @@ dispatch_async(dispatch_get_main_queue(), ^{
             // sizeval.height = height;
             sizeval.width =constraintval.width;
             
+            
+            
             //    NSString *CellIdentifier = @"detail_item_kv";
             DetailKVCell *cell = [tableView dequeueReusableCellWithIdentifier:CellIdentifier forIndexPath:indexPath];
             if(cell==nil)
@@ -2068,20 +2090,24 @@ dispatch_async(dispatch_get_main_queue(), ^{
             
             CGRect framekey = cell.keyLabel.frame;
             framekey.origin.x=CELL_MARGIN+LABEL_MARGIN;
-            framekey.origin.y=LINE_WIDTH;
+            framekey.origin.y=LINE_WIDTH/2;
             framekey.size = sizekey;
             cell.keyLabel.frame = framekey;
             cell.keyLabel.text=key;
+            cell.keyLabel.font = [UIFont systemFontOfSize:17.0];
+            
             CGRect frameval = cell.valLabel.frame;
             frameval.origin.x=constraintkey.width+CELL_MARGIN+3*LABEL_MARGIN; //2 margin for key 1 margin for value self
-            frameval.origin.y=LINE_WIDTH;
+            frameval.origin.y=0;
             frameval.size = sizeval;
             cell.valLabel.frame = frameval;
             //        [cell.valLabel setTextAlignment:RTTextAlignmentCenter];
             cell.valLabel.text= val;
+            cell.valLabel.font = [UIFont systemFontOfSize:17.0];
+           
             CGPoint rcenter;
             rcenter.x = width * 0.4+width * 0.6/2;
-            rcenter.y = height /2;
+            rcenter.y = (height+LINE_WIDTH) /2;
             cell.valLabel.center=rcenter;
             //        cell.valLabel.backgroundColor =[UIColor redColor];
             

RedAnt ERP Mobile/common/data_provider/RADataProvider.m

@@ -169,7 +169,7 @@
 //    2022-07-14。1.17
     //    2022-07-14。1.19
     
-NSDate * ddate =[dateFormatter dateFromString:@"2023-10-29"];
+NSDate * ddate =[dateFormatter dateFromString:@"2024-03-10"];
     
 //    bool review=[cdate earlierDate:ddate];
     NSTimeInterval secondsInterval= [cdate timeIntervalSinceDate:ddate];

RedAnt ERP Mobile/common/data_provider/iSalesDB.h

@@ -36,16 +36,17 @@ static bool btrigger = true;
 
 
 
-+ (void) save_pdf: (NSString*) temp_path filename:(NSString*) filename;
+//+ (void) save_pdf: (NSString*) temp_path filename:(NSString*) filename;
 
 
 + (int) get_recordcount:(sqlite3*)db table:(NSString*) tablename where:(NSString*) whereclause;
 
 //+ (NSData*) load_cached_img:(NSString*) filename loadFrom:(NSString*) path;
-+ (void) cache_img: (NSData*) imgData filename:(NSString*) name saveTo:(NSString*) path;
+//+ (void) cache_img: (NSData*) imgData filename:(NSString*) name saveTo:(NSString*) path;
 
 
-+ (NSDictionary*) search_pdf:(int) offset limit:(int)limit keywords:(NSString*) keywords;
+//+ (NSDictionary*) search_pdf:(int) offset limit:(int)limit keywords:(NSString*) keywords;
+
 +(NSArray*) get_saveduser;
 
 + (sqlite3*) get_db_at:(NSString* )path;

RedAnt ERP Mobile/common/data_provider/iSalesDB.m

@@ -495,71 +495,47 @@ void decryptfield (sqlite3_context *context, int argc, sqlite3_value **argv) {
         DebugLog(@"PDF SAVE FAILED,%@",filename);
     
 }
-+ (void) cache_img: (NSData*) imgData filename:(NSString*) name saveTo:(NSString*) path
-{
-    
-    path=[path stringByReplacingOccurrencesOfString:@"https://" withString:@""];
-    path=[path stringByReplacingOccurrencesOfString:@"http://" withString:@""];
-    path=[path stringByReplacingOccurrencesOfString:name withString:@""];
-    
-    //    NSArray *paths = NSSearchPathForDirectoriesInDomains(NSCachesDirectory, NSUserDomainMask, YES);
-    //    NSString *cachefolder = [paths objectAtIndex:0];
-    //    NSString *img_cache = [cachefolder stringByAppendingPathComponent:[NSString stringWithFormat:@"img_cache/%@",@"www.newpacificdirect.com/u/NPD/20160615/mytest/"]];
-    //    if ([[NSFileManager defaultManager] fileExistsAtPath:img_cache]) {
-    //
-    //        DebugLog(@"目录已经存在了");
-    //
-    //    }
-    //    else
-    //    {
-    //        NSError *error = nil;
-    //        bool bsuccess=[[NSFileManager defaultManager] createDirectoryAtPath:img_cache withIntermediateDirectories:YES attributes:nil error:&error];
-    //
-    //        if(!bsuccess)
-    //            DebugLog(@"Create temp folder failed");
-    //    }
-    
-    
-    if(path.length==0)
-        path=@"";
-    
-//    AppDelegate *appDelegate = (AppDelegate*)[[UIApplication sharedApplication] delegate];
+//+ (void) cache_img: (NSData*) imgData filename:(NSString*) name saveTo:(NSString*) path
+//{
+//    
+//    path=[path stringByReplacingOccurrencesOfString:@"https://" withString:@""];
+//    path=[path stringByReplacingOccurrencesOfString:@"http://" withString:@""];
+//    path=[path stringByReplacingOccurrencesOfString:name withString:@""];
+//    
 //
-//    if(appDelegate.bEnable_Cache==false)
-//        return ;
-    if(imgData==nil)
-        return;
-    NSArray *paths = NSSearchPathForDirectoriesInDomains(NSCachesDirectory, NSUserDomainMask, YES);
-    NSString *cachefolder = [paths objectAtIndex:0];
-    NSString *img_cache = [cachefolder stringByAppendingPathComponent:[NSString stringWithFormat:@"img_cache/%@",path]];
-    NSFileManager* fileManager = [NSFileManager defaultManager];
-    BOOL bdir=YES;
-    if(!  [fileManager fileExistsAtPath:img_cache isDirectory:&bdir])
-    {
-        
-        NSError *error = nil;
-        bool bsuccess=[fileManager createDirectoryAtPath:img_cache withIntermediateDirectories:YES attributes:nil error:&error];
-        
-        if(!bsuccess)
-            DebugLog(@"Create cache folder failed");
-        
-        //        if(bsuccess)
-        //        {
-        //            sqlite3 *db = [self get_db];
-        //
-        //            [self execSql:[NSString stringWithFormat:@"insert into img_cache(name) values('%@')",name] db:db];
-        //            [iSalesDB close_db:db];
-        //        }
-    }
-    NSString *filePath = [img_cache stringByAppendingPathComponent:name];
-    bool bsuccess=[imgData writeToFile:filePath atomically:YES];
-    
-    if(bsuccess)
-        DebugLog(@"IMG CACHE SUCCESS,%@",name);
-    else
-        DebugLog(@"IMG CACHE FAILED,%@",name);
-    
-}
+//    
+//    
+//    if(path.length==0)
+//        path=@"";
+//    
+//
+//    if(imgData==nil)
+//        return;
+//    NSArray *paths = NSSearchPathForDirectoriesInDomains(NSCachesDirectory, NSUserDomainMask, YES);
+//    NSString *cachefolder = [paths objectAtIndex:0];
+//    NSString *img_cache = [cachefolder stringByAppendingPathComponent:[NSString stringWithFormat:@"img_cache/%@",path]];
+//    NSFileManager* fileManager = [NSFileManager defaultManager];
+//    BOOL bdir=YES;
+//    if(!  [fileManager fileExistsAtPath:img_cache isDirectory:&bdir])
+//    {
+//        
+//        NSError *error = nil;
+//        bool bsuccess=[fileManager createDirectoryAtPath:img_cache withIntermediateDirectories:YES attributes:nil error:&error];
+//        
+//        if(!bsuccess)
+//            DebugLog(@"Create cache folder failed");
+//        
+//
+//    }
+//    NSString *filePath = [img_cache stringByAppendingPathComponent:name];
+//    bool bsuccess=[imgData writeToFile:filePath atomically:YES];
+//    
+//    if(bsuccess)
+//        DebugLog(@"IMG CACHE SUCCESS,%@",name);
+//    else
+//        DebugLog(@"IMG CACHE FAILED,%@",name);
+//    
+//}
 //+ (NSData*) load_cached_img:(NSString*) filename loadFrom:(NSString*) path
 //{
 //    if(path.length==0)

RedAnt ERP Mobile/iSales-CONTRAST.xcodeproj/xcuserdata/ruizhang.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -7,7 +7,7 @@
 		<key>iSales-CONTRAST.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>1</integer>
+			<integer>3</integer>
 		</dict>
 	</dict>
 </dict>

common/FileCache.m

@@ -21,31 +21,13 @@
     path=[path stringByReplacingOccurrencesOfString:@"http://" withString:@""];
     path=[path stringByReplacingOccurrencesOfString:name withString:@""];
     
-    //    NSArray *paths = NSSearchPathForDirectoriesInDomains(NSCachesDirectory, NSUserDomainMask, YES);
-    //    NSString *cachefolder = [paths objectAtIndex:0];
-    //    NSString *img_cache = [cachefolder stringByAppendingPathComponent:[NSString stringWithFormat:@"img_cache/%@",@"www.newpacificdirect.com/u/NPD/20160615/mytest/"]];
-    //    if ([[NSFileManager defaultManager] fileExistsAtPath:img_cache]) {
-    //
-    //        DebugLog(@"目录已经存在了");
-    //
-    //    }
-    //    else
-    //    {
-    //        NSError *error = nil;
-    //        bool bsuccess=[[NSFileManager defaultManager] createDirectoryAtPath:img_cache withIntermediateDirectories:YES attributes:nil error:&error];
-    //
-    //        if(!bsuccess)
-    //            DebugLog(@"Create temp folder failed");
-    //    }
+ 
     
     
     if(path.length==0)
         path=@"";
     
-//    AppDelegate *appDelegate = (AppDelegate*)[[UIApplication sharedApplication] delegate];
-    
-//    if(appDelegate.bEnable_Cache==false)
-//        return ;
+
     if(imgData==nil)
         return;
     NSArray *paths = NSSearchPathForDirectoriesInDomains(NSCachesDirectory, NSUserDomainMask, YES);
@@ -62,13 +44,7 @@
         if(!bsuccess)
             DebugLog(@"Create cache folder failed");
         
-        //        if(bsuccess)
-        //        {
-        //            sqlite3 *db = [self get_db];
-        //
-        //            [self execSql:[NSString stringWithFormat:@"insert into img_cache(name) values('%@')",name] db:db];
-        //            [iSalesDB close_db:db];
-        //        }
+
     }
     NSString *filePath = [img_cache stringByAppendingPathComponent:name];
     bool bsuccess=[imgData writeToFile:filePath atomically:YES];

common/NetworkUtils.h

@@ -36,4 +36,6 @@ typedef void(^dataHandler)(NSData *data);
 //+(void)request_file : (NSString*) url parameters:(NSMutableDictionary *) params  err_record_url:(NSString* )recorder_url completionHandler:(resultHandler)result;
 +(void)request_file_fast : (NSString*) url parameters:(NSMutableDictionary *) params completionHandler:(resultHandler)result;
 +(void)request_upload_fast :(NSData *)filedata   FileName:(NSString*) filename server:(NSString*) urlString parameters:(NSMutableDictionary *) params completionHandler:(resultHandler)result;
+
+
 @end

common/NetworkUtils.m

@@ -1109,4 +1109,7 @@ repeat:
     
 
 }
+
+
+
 @end

common/WK PDF+Web/WebViewController.h

@@ -19,6 +19,8 @@
 //@property (strong,nonatomic) NSString* title;
 @property (strong,nonatomic) NSData* content;
 
+@property int timeout;
+
 @property (nonatomic,assign) BOOL backItemDismiss;///<返回键响应是否为dismiss
 
 @property (nonatomic , copy) void (^onLoadSuccess)(NSString* url );

common/WK PDF+Web/WebViewController.m

@@ -98,9 +98,14 @@
     
     NSURL *url =[NSURL URLWithString:self.url];
     DebugLog(@"%@",self.url);
-    NSURLRequest *request =[NSURLRequest requestWithURL:url];
+    NSURLRequest *request =[NSURLRequest requestWithURL:url cachePolicy:NSURLRequestReloadIgnoringLocalAndRemoteCacheData timeoutInterval:self.timeout];
+    
+//    if(self.timeout>0)
+//        request.timeoutInterval = self.timeout;
     [self.wkWebview loadRequest:request];
     
+    
+    
 //    dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
 
     
@@ -136,8 +141,16 @@
         
     
 }
+- (void)webView:(WKWebView *)webView didFailProvisionalNavigation:(null_unspecified WKNavigation *)navigation withError:(NSError *)error
+{
+    self.mum.hidden=true;
+}
 
 
+- (void)webView:(WKWebView *)webView didFailNavigation:(null_unspecified WKNavigation *)navigation withError:(NSError *)error
+{
+    self.mum.hidden=true;
+}
 /*
 #pragma mark - Navigation
 

common/customUI/RTLabel.m

@@ -410,6 +410,7 @@
 	CGFloat minLineHeight = 0; 
 	CGFloat paragraphSpacing = 0.0;
 	CGFloat paragraphSpacingBefore = 0.0;
+    
 	CTTextAlignment textAlignment = (CTTextAlignment)_textAlignment;
 	CTLineBreakMode lineBreakMode = (CTLineBreakMode)_lineBreakMode;
 	CGFloat lineSpacing = _lineSpacing;

common/customUI/commoneditor/CommonEditor.storyboard

@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="21701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
-    <device id="ipad9_7" orientation="portrait" layout="fullscreen" appearance="light"/>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="22505" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+    <device id="retina6_12" orientation="portrait" appearance="light"/>
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21678"/>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22504"/>
+        <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -11,16 +13,12 @@
         <scene sceneID="E5d-Rh-3tk">
             <objects>
                 <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"/>
-                    </layoutGuides>
                     <view key="view" contentMode="scaleToFill" id="SzR-aC-W21">
-                        <rect key="frame" x="0.0" y="0.0" width="768" height="1024"/>
+                        <rect key="frame" x="0.0" y="0.0" width="393" height="852"/>
                         <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="224" y="93" width="320" height="216"/>
+                                <rect key="frame" x="36.666666666666657" y="132" width="320" height="216"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="216" id="i19-IZ-5lG"/>
                                     <constraint firstAttribute="width" constant="320" id="kgj-3V-Kud"/>
@@ -30,7 +28,7 @@
                                 </connections>
                             </datePicker>
                             <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="cRS-hn-ulf">
-                                <rect key="frame" x="0.0" y="64" width="768" height="21"/>
+                                <rect key="frame" x="0.0" y="103" width="393" height="21"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="21" id="wIP-4K-hIU"/>
                                 </constraints>
@@ -39,7 +37,7 @@
                                 <nil key="highlightedColor"/>
                             </label>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="pXA-kN-pBh">
-                                <rect key="frame" x="330" y="503" width="108" height="39"/>
+                                <rect key="frame" x="142.66666666666666" y="542" width="108" height="39"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="39" id="MQB-L6-0h7"/>
                                     <constraint firstAttribute="width" constant="108" id="XQI-LU-ubc"/>
@@ -51,15 +49,16 @@
                                 </connections>
                             </button>
                         </subviews>
+                        <viewLayoutGuide key="safeArea" id="y6o-3B-ad7"/>
                         <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <constraints>
-                            <constraint firstItem="cRS-hn-ulf" firstAttribute="top" secondItem="oEN-IW-3xG" secondAttribute="bottom" constant="44" id="3Zn-QP-iZv"/>
+                            <constraint firstItem="cRS-hn-ulf" firstAttribute="top" secondItem="y6o-3B-ad7" secondAttribute="top" constant="44" id="3Zn-QP-iZv"/>
                             <constraint firstItem="pXA-kN-pBh" firstAttribute="top" secondItem="92Z-Po-m6V" secondAttribute="bottom" constant="194" id="8DL-oC-dRz"/>
-                            <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 firstItem="cRS-hn-ulf" firstAttribute="leading" secondItem="y6o-3B-ad7" secondAttribute="leading" id="CRs-B5-0Jb"/>
+                            <constraint firstItem="y6o-3B-ad7" firstAttribute="trailing" secondItem="cRS-hn-ulf" secondAttribute="trailing" id="CrK-F6-xZH"/>
+                            <constraint firstItem="pXA-kN-pBh" firstAttribute="centerX" secondItem="y6o-3B-ad7" secondAttribute="centerX" id="Ner-ft-bgy"/>
                             <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="centerX" secondItem="SzR-aC-W21" secondAttribute="centerX" id="l28-uS-zYR"/>
+                            <constraint firstItem="92Z-Po-m6V" firstAttribute="centerX" secondItem="y6o-3B-ad7" secondAttribute="centerX" id="l28-uS-zYR"/>
                         </constraints>
                     </view>
                     <navigationItem key="navigationItem" title="Title" id="mup-at-2Ts"/>
@@ -76,25 +75,22 @@
         <scene sceneID="ja8-7Q-Dgv">
             <objects>
                 <viewController storyboardIdentifier="TearSheetParamViewController" autoresizesArchivedViewToFullSize="NO" title="TearSheetParamViewController" useStoryboardIdentifierAsRestorationIdentifier="YES" id="6QI-1v-YnK" customClass="TearSheetParamViewController" sceneMemberID="viewController">
-                    <layoutGuides>
-                        <viewControllerLayoutGuide type="top" id="fO7-aZ-6ik"/>
-                        <viewControllerLayoutGuide type="bottom" id="koD-GF-zYK"/>
-                    </layoutGuides>
                     <view key="view" contentMode="scaleToFill" id="5tu-uj-zDA">
-                        <rect key="frame" x="0.0" y="0.0" width="768" height="1024"/>
+                        <rect key="frame" x="0.0" y="0.0" width="393" height="852"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                         <subviews>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="fRq-qQ-HYw" customClass="CommonEditorTableContainerView">
-                                <rect key="frame" x="0.0" y="20" width="768" height="1004"/>
+                                <rect key="frame" x="0.0" y="59" width="393" height="759"/>
                                 <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                             </view>
                         </subviews>
+                        <viewLayoutGuide key="safeArea" id="bvp-dR-e9s"/>
                         <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <constraints>
-                            <constraint firstItem="koD-GF-zYK" firstAttribute="top" secondItem="fRq-qQ-HYw" secondAttribute="bottom" id="KoQ-b5-qDf"/>
-                            <constraint firstItem="fRq-qQ-HYw" firstAttribute="top" secondItem="fO7-aZ-6ik" secondAttribute="bottom" id="SXC-0K-JT0"/>
-                            <constraint firstAttribute="trailing" secondItem="fRq-qQ-HYw" secondAttribute="trailing" id="jCD-gq-xNI"/>
-                            <constraint firstItem="fRq-qQ-HYw" firstAttribute="leading" secondItem="5tu-uj-zDA" secondAttribute="leading" id="odD-EB-Hoc"/>
+                            <constraint firstItem="bvp-dR-e9s" firstAttribute="bottom" secondItem="fRq-qQ-HYw" secondAttribute="bottom" id="KoQ-b5-qDf"/>
+                            <constraint firstItem="fRq-qQ-HYw" firstAttribute="top" secondItem="bvp-dR-e9s" secondAttribute="top" id="SXC-0K-JT0"/>
+                            <constraint firstItem="bvp-dR-e9s" firstAttribute="trailing" secondItem="fRq-qQ-HYw" secondAttribute="trailing" id="jCD-gq-xNI"/>
+                            <constraint firstItem="fRq-qQ-HYw" firstAttribute="leading" secondItem="bvp-dR-e9s" secondAttribute="leading" id="odD-EB-Hoc"/>
                         </constraints>
                     </view>
                     <navigationItem key="navigationItem" title="Title" id="vmX-GK-cbP">
@@ -112,25 +108,22 @@
         <scene sceneID="c3J-cH-SZL">
             <objects>
                 <viewController storyboardIdentifier="CustomerInfoViewController" title="CustomerInfoViewController" useStoryboardIdentifierAsRestorationIdentifier="YES" id="iDP-Ox-Rb4" customClass="CustomerInfoViewController" sceneMemberID="viewController">
-                    <layoutGuides>
-                        <viewControllerLayoutGuide type="top" id="WrT-ig-xTY"/>
-                        <viewControllerLayoutGuide type="bottom" id="FIx-nN-5av"/>
-                    </layoutGuides>
                     <view key="view" contentMode="scaleToFill" id="XtO-XI-aMh">
-                        <rect key="frame" x="0.0" y="0.0" width="768" height="1024"/>
+                        <rect key="frame" x="0.0" y="0.0" width="393" height="852"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                         <subviews>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="DDb-ec-Hh3" customClass="CommonEditorTableContainerView">
-                                <rect key="frame" x="0.0" y="20" width="768" height="1004"/>
+                                <rect key="frame" x="0.0" y="59" width="393" height="759"/>
                                 <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                             </view>
                         </subviews>
+                        <viewLayoutGuide key="safeArea" id="IYK-ME-tm4"/>
                         <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <constraints>
-                            <constraint firstItem="FIx-nN-5av" firstAttribute="top" secondItem="DDb-ec-Hh3" secondAttribute="bottom" id="98F-aK-vl8"/>
-                            <constraint firstAttribute="trailing" secondItem="DDb-ec-Hh3" secondAttribute="trailing" id="c50-gc-Dqu"/>
-                            <constraint firstItem="DDb-ec-Hh3" firstAttribute="leading" secondItem="XtO-XI-aMh" secondAttribute="leading" id="cxY-48-st0"/>
-                            <constraint firstItem="DDb-ec-Hh3" firstAttribute="top" secondItem="WrT-ig-xTY" secondAttribute="bottom" id="fPK-QX-w09"/>
+                            <constraint firstItem="IYK-ME-tm4" firstAttribute="bottom" secondItem="DDb-ec-Hh3" secondAttribute="bottom" id="98F-aK-vl8"/>
+                            <constraint firstItem="IYK-ME-tm4" firstAttribute="trailing" secondItem="DDb-ec-Hh3" secondAttribute="trailing" id="c50-gc-Dqu"/>
+                            <constraint firstItem="DDb-ec-Hh3" firstAttribute="leading" secondItem="IYK-ME-tm4" secondAttribute="leading" id="cxY-48-st0"/>
+                            <constraint firstItem="DDb-ec-Hh3" firstAttribute="top" secondItem="IYK-ME-tm4" secondAttribute="top" id="fPK-QX-w09"/>
                         </constraints>
                     </view>
                     <navigationItem key="navigationItem" title="Title" id="bMA-ol-BQB">
@@ -162,38 +155,34 @@
         <scene sceneID="qzn-Lm-U9Y">
             <objects>
                 <viewController storyboardIdentifier="TearSheetParamViewController_bak" autoresizesArchivedViewToFullSize="NO" title="TearSheetParamViewController" useStoryboardIdentifierAsRestorationIdentifier="YES" id="4fm-pj-gzK" customClass="TearSheetParamViewController" sceneMemberID="viewController">
-                    <layoutGuides>
-                        <viewControllerLayoutGuide type="top" id="MeI-SB-T0P"/>
-                        <viewControllerLayoutGuide type="bottom" id="Z3g-6Z-XdP"/>
-                    </layoutGuides>
                     <view key="view" contentMode="scaleToFill" id="gVZ-mi-d3e">
-                        <rect key="frame" x="0.0" y="0.0" width="768" height="1024"/>
+                        <rect key="frame" x="0.0" y="0.0" width="393" height="852"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                         <subviews>
                             <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="grouped" separatorStyle="default" rowHeight="44" sectionHeaderHeight="10" sectionFooterHeight="10" translatesAutoresizingMaskIntoConstraints="NO" id="cVR-ie-r6g">
-                                <rect key="frame" x="0.0" y="20" width="768" height="1004"/>
+                                <rect key="frame" x="-4" y="59" width="401" height="759"/>
                                 <color key="backgroundColor" red="0.93725490199999995" green="0.93725490199999995" blue="0.95686274510000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <prototypes>
                                     <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="CommonEditorCellModel" rowHeight="140" id="Oph-ee-jLz" customClass="CommonEditorCellModel">
-                                        <rect key="frame" x="0.0" y="55.5" width="768" height="140"/>
+                                        <rect key="frame" x="0.0" y="55.333332061767578" width="401" height="140"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Oph-ee-jLz" id="QtW-xN-XkR">
-                                            <rect key="frame" x="0.0" y="0.0" width="768" height="140"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="401" height="140"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="xyL-8k-wtS">
-                                                    <rect key="frame" x="20" y="20" width="100" height="100"/>
+                                                    <rect key="frame" x="20" y="20" width="51" height="100"/>
                                                     <constraints>
                                                         <constraint firstAttribute="width" secondItem="xyL-8k-wtS" secondAttribute="height" multiplier="1:1" id="dGT-ht-cQx"/>
                                                     </constraints>
                                                 </imageView>
                                                 <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="name&amp;description" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="kQY-cC-a1O">
-                                                    <rect key="frame" x="128" y="15" width="318" height="81"/>
+                                                    <rect key="frame" x="79" y="15" width="0.0" height="81"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="1234567.00" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="JbR-cP-27F">
-                                                    <rect key="frame" x="617" y="45" width="129" height="21"/>
+                                                    <rect key="frame" x="250" y="45" width="129" height="21"/>
                                                     <constraints>
                                                         <constraint firstAttribute="width" constant="129" id="t8p-9t-a80"/>
                                                     </constraints>
@@ -201,7 +190,7 @@
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="x9999" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="upV-Ia-ppl">
-                                                    <rect key="frame" x="617" y="75" width="129" height="21"/>
+                                                    <rect key="frame" x="250" y="75" width="129" height="21"/>
                                                     <constraints>
                                                         <constraint firstAttribute="width" constant="129" id="PJs-pk-O8n"/>
                                                     </constraints>
@@ -209,7 +198,7 @@
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Masert pack:9999" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="r8P-zz-ghp">
-                                                    <rect key="frame" x="461.5" y="15" width="141" height="21"/>
+                                                    <rect key="frame" x="94.666666666666686" y="15" width="141" height="21"/>
                                                     <constraints>
                                                         <constraint firstAttribute="height" constant="21" id="d98-wP-8OV"/>
                                                     </constraints>
@@ -218,7 +207,7 @@
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="$1234567.00" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="jGx-Zc-PSC" customClass="StrikethroughLabel">
-                                                    <rect key="frame" x="481" y="45" width="102" height="21"/>
+                                                    <rect key="frame" x="114" y="45" width="102" height="21"/>
                                                     <constraints>
                                                         <constraint firstAttribute="width" constant="102" id="h0I-FO-Hjp"/>
                                                         <constraint firstAttribute="height" constant="21" id="xQ5-3U-Tdd"/>
@@ -228,7 +217,7 @@
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Discount 99.99% off" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="qQ7-Xt-Okx">
-                                                    <rect key="frame" x="454" y="75" width="156" height="21"/>
+                                                    <rect key="frame" x="87" y="75" width="156" height="21"/>
                                                     <constraints>
                                                         <constraint firstAttribute="width" constant="156" id="Y2G-ca-pwa"/>
                                                     </constraints>
@@ -237,7 +226,7 @@
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Price ($)" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="3Bs-vh-lne">
-                                                    <rect key="frame" x="617" y="15" width="129" height="21"/>
+                                                    <rect key="frame" x="250" y="15" width="129" height="21"/>
                                                     <constraints>
                                                         <constraint firstAttribute="width" constant="129" id="iQr-Bp-uSa"/>
                                                     </constraints>
@@ -246,7 +235,7 @@
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="123456789.00" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Zni-Ef-gpT">
-                                                    <rect key="frame" x="617" y="106" width="129" height="21"/>
+                                                    <rect key="frame" x="250" y="106" width="129" height="21"/>
                                                     <constraints>
                                                         <constraint firstAttribute="width" constant="129" id="xqH-Td-DCZ"/>
                                                     </constraints>
@@ -254,7 +243,7 @@
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="6Yw-LP-Zra">
-                                                    <rect key="frame" x="128" y="102" width="46" height="29"/>
+                                                    <rect key="frame" x="79" y="102" width="46" height="29"/>
                                                     <state key="normal" title="Button"/>
                                                     <connections>
                                                         <action selector="onClickBundle:" destination="Oph-ee-jLz" eventType="touchUpInside" id="2lX-bY-x79"/>
@@ -304,14 +293,14 @@
                                         </connections>
                                     </tableViewCell>
                                     <tableViewCell contentMode="scaleToFill" restorationIdentifier="CommonEditorCellAction" selectionStyle="default" indentationWidth="10" reuseIdentifier="CommonEditorCellAction" id="ssj-oz-bAi" customClass="CommonEditorCellAction">
-                                        <rect key="frame" x="0.0" y="195.5" width="768" height="44"/>
+                                        <rect key="frame" x="0.0" y="195.33333206176758" width="401" height="44"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="ssj-oz-bAi" id="vUH-NQ-LZ9">
-                                            <rect key="frame" x="0.0" y="0.0" width="768" height="44"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="401" height="44"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="GAc-U7-8pe">
-                                                    <rect key="frame" x="8" y="11" width="752" height="22"/>
+                                                    <rect key="frame" x="8" y="11" width="385" height="22"/>
                                                     <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"/>
@@ -330,27 +319,27 @@
                                         </connections>
                                     </tableViewCell>
                                     <tableViewCell contentMode="scaleToFill" restorationIdentifier="CommonEditorCellMAction" selectionStyle="default" indentationWidth="10" reuseIdentifier="CommonEditorCellMAction" id="07f-ff-k30" customClass="CommonEditorCellMAction">
-                                        <rect key="frame" x="0.0" y="239.5" width="768" height="44"/>
+                                        <rect key="frame" x="0.0" y="239.33333206176758" width="401" height="44"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="07f-ff-k30" id="Ume-mi-cJc">
-                                            <rect key="frame" x="0.0" y="0.0" width="768" height="44"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="401" height="44"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="CnD-CA-7GQ" userLabel="action0">
-                                                    <rect key="frame" x="583" y="7" width="169" height="30"/>
+                                                    <rect key="frame" x="381" y="7" width="0.0" height="30"/>
                                                     <color key="backgroundColor" red="0.59999999999999998" green="0.40000000000000002" blue="0.20000000000000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                     <state key="normal" title="Button">
                                                         <color key="titleColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                     </state>
                                                 </button>
                                                 <button opaque="NO" tag="3" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Hv6-Vm-wzL" userLabel="action3">
-                                                    <rect key="frame" x="16" y="7" width="169" height="30"/>
+                                                    <rect key="frame" x="20" y="7" width="165" height="30"/>
                                                     <color key="backgroundColor" red="0.59999999999999998" green="0.40000000000000002" blue="0.20000000000000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                     <state key="normal" title="Button">
                                                         <color key="titleColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                     </state>
                                                 </button>
-                                                <button opaque="NO" tag="1" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="bPv-vc-eg3" userLabel="action1">
+                                                <button opaque="NO" tag="1" contentMode="scaleToFill" ambiguous="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="bPv-vc-eg3" userLabel="action1">
                                                     <rect key="frame" x="393" y="7" width="170" height="30"/>
                                                     <color key="backgroundColor" red="0.59999999999999998" green="0.40000000000000002" blue="0.20000000000000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                     <constraints>
@@ -360,7 +349,7 @@
                                                         <color key="titleColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                     </state>
                                                 </button>
-                                                <button opaque="NO" tag="2" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="fb7-qu-iUy" userLabel="action2">
+                                                <button opaque="NO" tag="2" contentMode="scaleToFill" ambiguous="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="fb7-qu-iUy" userLabel="action2">
                                                     <rect key="frame" x="204" y="7" width="170" height="30"/>
                                                     <color key="backgroundColor" red="0.59999999999999998" green="0.40000000000000002" blue="0.20000000000000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                     <constraints>
@@ -392,14 +381,14 @@
                                         </connections>
                                     </tableViewCell>
                                     <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="CommonEditorCellLabel" id="6Qk-ct-Qby" customClass="CommonEditorCellLabel">
-                                        <rect key="frame" x="0.0" y="283.5" width="768" height="44"/>
+                                        <rect key="frame" x="0.0" y="283.33333206176758" width="401" height="44"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="6Qk-ct-Qby" id="RHD-Jr-MC2">
-                                            <rect key="frame" x="0.0" y="0.0" width="768" height="44"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="401" height="44"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Eto-n8-WRZ">
-                                                    <rect key="frame" x="16" y="11" width="150" height="22"/>
+                                                    <rect key="frame" x="20" y="11" width="150" height="22"/>
                                                     <constraints>
                                                         <constraint firstAttribute="width" constant="150" id="kc1-sp-Hhv"/>
                                                     </constraints>
@@ -408,7 +397,7 @@
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="XSt-jY-jcF">
-                                                    <rect key="frame" x="174" y="10" width="579" height="23"/>
+                                                    <rect key="frame" x="178" y="10" width="208" height="23"/>
                                                     <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"/>
@@ -430,14 +419,14 @@
                                         </connections>
                                     </tableViewCell>
                                     <tableViewCell contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="CommonEditorCellEdit" rowHeight="44" id="PEs-Tx-N1l" customClass="CommonEditorCellEdit">
-                                        <rect key="frame" x="0.0" y="327.5" width="768" height="44"/>
+                                        <rect key="frame" x="0.0" y="327.33333206176758" width="401" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="PEs-Tx-N1l" id="g6q-oB-WEG">
-                                            <rect key="frame" x="0.0" y="0.0" width="768" height="44"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="401" height="44"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="E0p-Rv-1zb">
-                                                    <rect key="frame" x="16" y="11" width="150" height="22"/>
+                                                    <rect key="frame" x="20" y="11" width="150" height="22"/>
                                                     <constraints>
                                                         <constraint firstAttribute="width" constant="150" id="fRO-qS-a7v"/>
                                                     </constraints>
@@ -446,12 +435,12 @@
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" textAlignment="right" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="HoV-0G-uys">
-                                                    <rect key="frame" x="172" y="7" width="581" height="30"/>
+                                                    <rect key="frame" x="176" y="7" width="210" height="30"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                                     <textInputTraits key="textInputTraits"/>
                                                 </textField>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="*" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Igi-Fb-ILh">
-                                                    <rect key="frame" x="6" y="11" width="10" height="22"/>
+                                                    <rect key="frame" x="10" y="11" width="10" height="22"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="25"/>
                                                     <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                     <nil key="highlightedColor"/>
@@ -477,19 +466,19 @@
                                         </connections>
                                     </tableViewCell>
                                     <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="CommonEditorCellEnum" id="9AR-rS-Bcu" customClass="CommonEditorCellEnum">
-                                        <rect key="frame" x="0.0" y="371.5" width="768" height="44"/>
+                                        <rect key="frame" x="0.0" y="371.33333206176758" width="401" height="44"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="9AR-rS-Bcu" id="jAQ-Sk-bhV">
-                                            <rect key="frame" x="0.0" y="0.0" width="768" height="44"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="401" height="44"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="fsV-Kc-L7Z">
-                                                    <rect key="frame" x="172" y="11" width="581" height="22"/>
+                                                    <rect key="frame" x="176" y="11" width="210" height="22"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="68s-LN-X9p">
-                                                    <rect key="frame" x="16" y="11" width="150" height="22"/>
+                                                    <rect key="frame" x="20" y="11" width="150" height="22"/>
                                                     <constraints>
                                                         <constraint firstAttribute="width" constant="150" id="eEm-0D-Kmg"/>
                                                     </constraints>
@@ -497,7 +486,7 @@
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="*" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="shN-OG-xWN">
-                                                    <rect key="frame" x="6" y="11" width="10" height="22"/>
+                                                    <rect key="frame" x="10" y="10.333333333333334" width="10" height="23.333333333333329"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="25"/>
                                                     <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                     <nil key="highlightedColor"/>
@@ -523,14 +512,14 @@
                                         </connections>
                                     </tableViewCell>
                                     <tableViewCell contentMode="scaleToFill" restorationIdentifier="CommonEditorCellTextView" selectionStyle="default" indentationWidth="10" reuseIdentifier="CommonEditorCellTextView" rowHeight="140" id="dmX-be-8Su" customClass="CommonEditorCellTextView">
-                                        <rect key="frame" x="0.0" y="415.5" width="768" height="140"/>
+                                        <rect key="frame" x="0.0" y="415.33333206176758" width="401" height="140"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="dmX-be-8Su" id="OGD-ef-ifx">
-                                            <rect key="frame" x="0.0" y="0.0" width="768" height="140"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="401" height="140"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="GKX-OM-LDl">
-                                                    <rect key="frame" x="16" y="53" width="150" height="21"/>
+                                                    <rect key="frame" x="20" y="53" width="150" height="21"/>
                                                     <constraints>
                                                         <constraint firstAttribute="width" constant="150" id="ABR-Cl-OHU"/>
                                                     </constraints>
@@ -539,13 +528,13 @@
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="*" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="pma-ii-OXW">
-                                                    <rect key="frame" x="174" y="59" width="10" height="22"/>
+                                                    <rect key="frame" x="178" y="59" width="10" height="22"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="25"/>
                                                     <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" showsHorizontalScrollIndicator="NO" editable="NO" textAlignment="natural" translatesAutoresizingMaskIntoConstraints="NO" id="Exn-gg-C5X">
-                                                    <rect key="frame" x="172" y="6" width="581" height="128"/>
+                                                    <rect key="frame" x="176" y="6" width="210" height="128"/>
                                                     <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                     <string key="text">Lorem ipsum dolor sit er elit lamet, consectetaur cillium adipisicing pecu, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. Nam liber te conscient to factor tum poen legum odioque civiuda.</string>
                                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
@@ -572,14 +561,14 @@
                                         </connections>
                                     </tableViewCell>
                                     <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="CommonEditorCellSignature" rowHeight="140" id="1AQ-3f-NcM" customClass="CommonEditorCellSignature">
-                                        <rect key="frame" x="0.0" y="555.5" width="768" height="140"/>
+                                        <rect key="frame" x="0.0" y="555.33333206176758" width="401" height="140"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="1AQ-3f-NcM" id="1Ve-Rc-Loo">
-                                            <rect key="frame" x="0.0" y="0.0" width="768" height="140"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="401" height="140"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="OZz-lo-hvF">
-                                                    <rect key="frame" x="16" y="59" width="150" height="22"/>
+                                                    <rect key="frame" x="20" y="59" width="150" height="22"/>
                                                     <constraints>
                                                         <constraint firstAttribute="width" constant="150" id="qRB-Az-nvx"/>
                                                     </constraints>
@@ -588,13 +577,13 @@
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="*" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="VPO-Kk-Odn">
-                                                    <rect key="frame" x="6" y="59" width="10" height="22"/>
+                                                    <rect key="frame" x="10" y="58.333333333333336" width="10" height="23.333333333333336"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="25"/>
                                                     <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="l6i-Tj-KRU">
-                                                    <rect key="frame" x="172" y="10" width="581" height="120"/>
+                                                    <rect key="frame" x="176" y="10" width="210" height="120"/>
                                                 </imageView>
                                             </subviews>
                                             <constraints>
@@ -617,23 +606,23 @@
                                         </connections>
                                     </tableViewCell>
                                     <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="CommonEditorCellSwitch" rowHeight="44" id="Prk-wJ-Ou5" customClass="CommonEditorCellSwitch">
-                                        <rect key="frame" x="0.0" y="695.5" width="768" height="44"/>
+                                        <rect key="frame" x="0.0" y="695.33333206176758" width="401" height="44"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Prk-wJ-Ou5" id="gzm-zc-a8m">
-                                            <rect key="frame" x="0.0" y="0.0" width="768" height="44"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="401" height="44"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="7iy-PQ-jHE">
-                                                    <rect key="frame" x="16" y="11" width="680" height="22"/>
+                                                    <rect key="frame" x="20" y="11" width="309" height="22"/>
                                                     <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>
                                                 <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" on="YES" translatesAutoresizingMaskIntoConstraints="NO" id="IY2-bX-GX2">
-                                                    <rect key="frame" x="704" y="6" width="51" height="32"/>
+                                                    <rect key="frame" x="337" y="6" width="51" height="32"/>
                                                 </switch>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="*" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="alA-4a-5Hp">
-                                                    <rect key="frame" x="6" y="11" width="10" height="22"/>
+                                                    <rect key="frame" x="10" y="10.333333333333334" width="10" height="23.333333333333329"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="25"/>
                                                     <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                     <nil key="highlightedColor"/>
@@ -659,14 +648,14 @@
                                         </connections>
                                     </tableViewCell>
                                     <tableViewCell contentMode="scaleToFill" restorationIdentifier="CommonEditorCellImg" selectionStyle="default" indentationWidth="10" reuseIdentifier="CommonEditorCellImg" rowHeight="120" id="z4d-pv-B8K" customClass="CommonEditorCellImg">
-                                        <rect key="frame" x="0.0" y="739.5" width="768" height="120"/>
+                                        <rect key="frame" x="0.0" y="739.33333206176758" width="401" height="120"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="z4d-pv-B8K" id="8bH-ma-t1U">
-                                            <rect key="frame" x="0.0" y="0.0" width="768" height="120"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="401" height="120"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="GS6-Z7-fOK">
-                                                    <rect key="frame" x="16" y="53" width="150" height="21"/>
+                                                    <rect key="frame" x="20" y="53" width="150" height="21"/>
                                                     <constraints>
                                                         <constraint firstAttribute="width" constant="150" id="VqM-TE-997"/>
                                                     </constraints>
@@ -675,7 +664,7 @@
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="HmT-qo-FM0">
-                                                    <rect key="frame" x="652" y="10" width="100" height="100"/>
+                                                    <rect key="frame" x="281" y="10" width="100" height="100"/>
                                                     <constraints>
                                                         <constraint firstAttribute="width" constant="100" id="Kiu-nx-sHs"/>
                                                     </constraints>
@@ -684,7 +673,7 @@
                                                     </connections>
                                                 </button>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="dTl-qp-Cvg">
-                                                    <rect key="frame" x="172" y="53" width="472" height="21"/>
+                                                    <rect key="frame" x="176" y="53" width="97" height="21"/>
                                                     <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"/>
@@ -714,10 +703,11 @@
                                 </connections>
                             </tableView>
                         </subviews>
+                        <viewLayoutGuide key="safeArea" id="yZi-of-KDn"/>
                         <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <constraints>
                             <constraint firstItem="cVR-ie-r6g" firstAttribute="top" secondItem="gVZ-mi-d3e" secondAttribute="topMargin" id="5fc-TK-iqE"/>
-                            <constraint firstItem="cVR-ie-r6g" firstAttribute="centerX" secondItem="gVZ-mi-d3e" secondAttribute="centerX" id="7PP-sY-Pgi"/>
+                            <constraint firstItem="cVR-ie-r6g" firstAttribute="centerX" secondItem="yZi-of-KDn" secondAttribute="centerX" id="7PP-sY-Pgi"/>
                             <constraint firstItem="cVR-ie-r6g" firstAttribute="leading" secondItem="gVZ-mi-d3e" secondAttribute="leadingMargin" constant="-20" id="LEk-gu-SIt"/>
                             <constraint firstItem="cVR-ie-r6g" firstAttribute="bottom" secondItem="gVZ-mi-d3e" secondAttribute="bottomMargin" id="jhA-ee-mBa"/>
                         </constraints>
@@ -737,25 +727,22 @@
         <scene sceneID="rUw-JH-xSg">
             <objects>
                 <viewController storyboardIdentifier="CommonEditorViewController" title="CommonEditorViewController" useStoryboardIdentifierAsRestorationIdentifier="YES" id="Jxb-UV-o22" customClass="CommonEditorViewController" sceneMemberID="viewController">
-                    <layoutGuides>
-                        <viewControllerLayoutGuide type="top" id="CDl-r0-75W"/>
-                        <viewControllerLayoutGuide type="bottom" id="0df-0C-nzy"/>
-                    </layoutGuides>
                     <view key="view" contentMode="scaleToFill" id="UkZ-Ir-leK">
-                        <rect key="frame" x="0.0" y="0.0" width="768" height="1024"/>
+                        <rect key="frame" x="0.0" y="0.0" width="393" height="852"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                         <subviews>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="O2x-9a-T6K" customClass="CommonEditorTableContainerView">
-                                <rect key="frame" x="0.0" y="20" width="768" height="1004"/>
+                                <rect key="frame" x="0.0" y="59" width="393" height="759"/>
                                 <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                             </view>
                         </subviews>
+                        <viewLayoutGuide key="safeArea" id="MPO-zJ-BPr"/>
                         <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <constraints>
-                            <constraint firstItem="0df-0C-nzy" firstAttribute="top" secondItem="O2x-9a-T6K" secondAttribute="bottom" id="6bq-Pf-qNM"/>
-                            <constraint firstItem="O2x-9a-T6K" firstAttribute="leading" secondItem="UkZ-Ir-leK" secondAttribute="leading" id="8ZK-dJ-geP"/>
-                            <constraint firstAttribute="trailing" secondItem="O2x-9a-T6K" secondAttribute="trailing" id="TqG-rD-KHo"/>
-                            <constraint firstItem="O2x-9a-T6K" firstAttribute="top" secondItem="CDl-r0-75W" secondAttribute="bottom" id="WCj-qM-gBb"/>
+                            <constraint firstItem="MPO-zJ-BPr" firstAttribute="bottom" secondItem="O2x-9a-T6K" secondAttribute="bottom" id="6bq-Pf-qNM"/>
+                            <constraint firstItem="O2x-9a-T6K" firstAttribute="leading" secondItem="MPO-zJ-BPr" secondAttribute="leading" id="8ZK-dJ-geP"/>
+                            <constraint firstItem="MPO-zJ-BPr" firstAttribute="trailing" secondItem="O2x-9a-T6K" secondAttribute="trailing" id="TqG-rD-KHo"/>
+                            <constraint firstItem="O2x-9a-T6K" firstAttribute="top" secondItem="MPO-zJ-BPr" secondAttribute="top" id="WCj-qM-gBb"/>
                         </constraints>
                     </view>
                     <navigationItem key="navigationItem" title="Title" id="iOj-4w-q00">
@@ -773,16 +760,12 @@
         <scene sceneID="2GO-Cm-m10">
             <objects>
                 <viewController storyboardIdentifier="MonthPickerViewController" useStoryboardIdentifierAsRestorationIdentifier="YES" id="7q7-QK-Sei" userLabel="MonthPickerViewController" customClass="MonthPickerViewController" sceneMemberID="viewController">
-                    <layoutGuides>
-                        <viewControllerLayoutGuide type="top" id="Hn9-Wf-3fY"/>
-                        <viewControllerLayoutGuide type="bottom" id="2Jm-P9-8GA"/>
-                    </layoutGuides>
                     <view key="view" contentMode="scaleToFill" id="ibP-8e-BGj">
-                        <rect key="frame" x="0.0" y="0.0" width="768" height="1024"/>
+                        <rect key="frame" x="0.0" y="0.0" width="393" height="852"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <pickerView contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="mUg-ig-66i" customClass="SRMonthPicker">
-                                <rect key="frame" x="0.0" y="93" width="768" height="216"/>
+                                <rect key="frame" x="0.0" y="132" width="393" height="216"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="216" id="yOg-II-a5j"/>
                                 </constraints>
@@ -791,7 +774,7 @@
                                 </connections>
                             </pickerView>
                             <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="wXG-oN-rkI">
-                                <rect key="frame" x="0.0" y="64" width="768" height="21"/>
+                                <rect key="frame" x="0.0" y="103" width="393" height="21"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="21" id="I25-D3-jtn"/>
                                 </constraints>
@@ -800,13 +783,14 @@
                                 <nil key="highlightedColor"/>
                             </label>
                         </subviews>
+                        <viewLayoutGuide key="safeArea" id="mDn-wU-bxk"/>
                         <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <constraints>
-                            <constraint firstItem="mUg-ig-66i" firstAttribute="leading" secondItem="ibP-8e-BGj" secondAttribute="leading" id="213-DS-Fnu"/>
-                            <constraint firstAttribute="trailing" secondItem="mUg-ig-66i" secondAttribute="trailing" id="90R-Vx-EPq"/>
-                            <constraint firstItem="wXG-oN-rkI" firstAttribute="top" secondItem="Hn9-Wf-3fY" secondAttribute="bottom" constant="44" id="Dso-u4-iu5"/>
-                            <constraint firstItem="wXG-oN-rkI" firstAttribute="leading" secondItem="ibP-8e-BGj" secondAttribute="leading" id="R64-q8-Rh8"/>
-                            <constraint firstAttribute="trailing" secondItem="wXG-oN-rkI" secondAttribute="trailing" id="qm5-ck-799"/>
+                            <constraint firstItem="mUg-ig-66i" firstAttribute="leading" secondItem="mDn-wU-bxk" secondAttribute="leading" id="213-DS-Fnu"/>
+                            <constraint firstItem="mDn-wU-bxk" firstAttribute="trailing" secondItem="mUg-ig-66i" secondAttribute="trailing" id="90R-Vx-EPq"/>
+                            <constraint firstItem="wXG-oN-rkI" firstAttribute="top" secondItem="mDn-wU-bxk" secondAttribute="top" constant="44" id="Dso-u4-iu5"/>
+                            <constraint firstItem="wXG-oN-rkI" firstAttribute="leading" secondItem="mDn-wU-bxk" secondAttribute="leading" id="R64-q8-Rh8"/>
+                            <constraint firstItem="mDn-wU-bxk" firstAttribute="trailing" secondItem="wXG-oN-rkI" secondAttribute="trailing" id="qm5-ck-799"/>
                             <constraint firstItem="mUg-ig-66i" firstAttribute="top" secondItem="wXG-oN-rkI" secondAttribute="bottom" constant="8" id="tfC-OO-Qcq"/>
                         </constraints>
                     </view>
@@ -830,27 +814,23 @@
         <scene sceneID="upn-sd-EFP">
             <objects>
                 <viewController storyboardIdentifier="EnumSelectorViewController" useStoryboardIdentifierAsRestorationIdentifier="YES" id="J7q-vO-Muw" customClass="EnumSelectViewController" sceneMemberID="viewController">
-                    <layoutGuides>
-                        <viewControllerLayoutGuide type="top" id="m7p-8b-euB"/>
-                        <viewControllerLayoutGuide type="bottom" id="qYo-Jw-otw"/>
-                    </layoutGuides>
                     <view key="view" contentMode="scaleToFill" id="bxp-Qn-bwL">
-                        <rect key="frame" x="0.0" y="0.0" width="540" height="680"/>
-                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                        <rect key="frame" x="0.0" y="0.0" width="393" height="852"/>
+                        <autoresizingMask key="autoresizingMask"/>
                         <subviews>
                             <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="22" sectionFooterHeight="22" translatesAutoresizingMaskIntoConstraints="NO" id="z59-4h-cB2">
-                                <rect key="frame" x="0.0" y="24" width="540" height="656"/>
+                                <rect key="frame" x="0.0" y="0.0" width="393" height="852"/>
                                 <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <prototypes>
                                     <tableViewCell contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="EnumSelectorCell" id="b1D-ac-iWB" customClass="EnumSelectorCell">
-                                        <rect key="frame" x="0.0" y="50" width="540" height="44"/>
+                                        <rect key="frame" x="0.0" y="50" width="393" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="b1D-ac-iWB" id="kPb-Xs-gEw">
-                                            <rect key="frame" x="0.0" y="0.0" width="540" height="44"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="393" height="44"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ysV-pp-Th5" customClass="RTLabel">
-                                                    <rect key="frame" x="15" y="5" width="478" height="34"/>
+                                                    <rect key="frame" x="15" y="5" width="327" height="34"/>
                                                     <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                 </view>
                                             </subviews>
@@ -872,46 +852,43 @@
                                 </connections>
                             </tableView>
                         </subviews>
+                        <viewLayoutGuide key="safeArea" id="b3g-as-2Ie"/>
                         <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <constraints>
-                            <constraint firstAttribute="trailing" secondItem="z59-4h-cB2" secondAttribute="trailing" id="E0B-n6-95V"/>
-                            <constraint firstItem="z59-4h-cB2" firstAttribute="top" secondItem="m7p-8b-euB" secondAttribute="bottom" constant="24" id="JsW-g0-HZE"/>
-                            <constraint firstItem="z59-4h-cB2" firstAttribute="leading" secondItem="bxp-Qn-bwL" secondAttribute="leading" id="VtK-y7-Mdo"/>
-                            <constraint firstItem="qYo-Jw-otw" firstAttribute="top" secondItem="z59-4h-cB2" secondAttribute="bottom" id="XLS-CH-b7r"/>
+                            <constraint firstItem="z59-4h-cB2" firstAttribute="leading" secondItem="b3g-as-2Ie" secondAttribute="leading" id="0kJ-d6-gGX"/>
+                            <constraint firstAttribute="bottom" secondItem="z59-4h-cB2" secondAttribute="bottom" id="MbJ-2u-bdB"/>
+                            <constraint firstItem="z59-4h-cB2" firstAttribute="trailing" secondItem="b3g-as-2Ie" secondAttribute="trailing" id="NSi-7v-PIz"/>
+                            <constraint firstItem="z59-4h-cB2" firstAttribute="top" secondItem="bxp-Qn-bwL" secondAttribute="top" id="q0k-ll-IBE"/>
                         </constraints>
                     </view>
                     <value key="contentSizeForViewInPopover" type="size" width="540" height="680"/>
-                    <modalFormSheetSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
                     <connections>
                         <outlet property="tableEnum" destination="z59-4h-cB2" id="YK4-HU-9Qu"/>
                     </connections>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="qsm-RJ-oeQ" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="2726.5625" y="486.91406249999994"/>
+            <point key="canvasLocation" x="2725.9541984732823" y="486.61971830985919"/>
         </scene>
         <!--View Image-->
         <scene sceneID="qR3-GS-yxr">
             <objects>
                 <viewController storyboardIdentifier="ImageViewController" title="View Image" useStoryboardIdentifierAsRestorationIdentifier="YES" id="sCm-H6-tjB" customClass="ImageViewController" sceneMemberID="viewController">
-                    <layoutGuides>
-                        <viewControllerLayoutGuide type="top" id="rRM-cG-F5H"/>
-                        <viewControllerLayoutGuide type="bottom" id="zBy-7G-oIK"/>
-                    </layoutGuides>
                     <view key="view" contentMode="scaleToFill" id="KOf-zj-yie">
-                        <rect key="frame" x="0.0" y="0.0" width="768" height="1024"/>
+                        <rect key="frame" x="0.0" y="0.0" width="393" height="852"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="5ur-Z0-4eb">
-                                <rect key="frame" x="0.0" y="20" width="768" height="1004"/>
+                                <rect key="frame" x="0.0" y="59" width="393" height="759"/>
                             </imageView>
                         </subviews>
+                        <viewLayoutGuide key="safeArea" id="tY9-HE-WIg"/>
                         <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <constraints>
-                            <constraint firstAttribute="trailing" secondItem="5ur-Z0-4eb" secondAttribute="trailing" id="5rI-wU-oPP"/>
-                            <constraint firstItem="5ur-Z0-4eb" firstAttribute="top" secondItem="rRM-cG-F5H" secondAttribute="bottom" id="Ml7-mu-csC"/>
-                            <constraint firstItem="zBy-7G-oIK" firstAttribute="top" secondItem="5ur-Z0-4eb" secondAttribute="bottom" id="QnM-sa-ztu"/>
-                            <constraint firstItem="5ur-Z0-4eb" firstAttribute="leading" secondItem="KOf-zj-yie" secondAttribute="leading" id="cyi-GB-FX3"/>
+                            <constraint firstItem="tY9-HE-WIg" firstAttribute="trailing" secondItem="5ur-Z0-4eb" secondAttribute="trailing" id="5rI-wU-oPP"/>
+                            <constraint firstItem="5ur-Z0-4eb" firstAttribute="top" secondItem="tY9-HE-WIg" secondAttribute="top" id="Ml7-mu-csC"/>
+                            <constraint firstItem="tY9-HE-WIg" firstAttribute="bottom" secondItem="5ur-Z0-4eb" secondAttribute="bottom" id="QnM-sa-ztu"/>
+                            <constraint firstItem="5ur-Z0-4eb" firstAttribute="leading" secondItem="tY9-HE-WIg" secondAttribute="leading" id="cyi-GB-FX3"/>
                         </constraints>
                     </view>
                     <connections>
@@ -926,12 +903,8 @@
         <scene sceneID="l77-sN-S74">
             <objects>
                 <viewController storyboardIdentifier="EnumSelectOnlineViewController" useStoryboardIdentifierAsRestorationIdentifier="YES" id="A1a-tK-2BG" customClass="EnumSelectOnlineViewController" sceneMemberID="viewController">
-                    <layoutGuides>
-                        <viewControllerLayoutGuide type="top" id="1gV-A8-KPP"/>
-                        <viewControllerLayoutGuide type="bottom" id="obC-fO-OxK"/>
-                    </layoutGuides>
                     <view key="view" contentMode="scaleToFill" id="U3R-Nq-VNq">
-                        <rect key="frame" x="0.0" y="0.0" width="768" height="1024"/>
+                        <rect key="frame" x="0.0" y="0.0" width="393" height="852"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                         <subviews>
                             <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="No Record" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="jes-xb-r2y">
@@ -942,18 +915,18 @@
                                 <nil key="highlightedColor"/>
                             </label>
                             <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="22" sectionFooterHeight="22" translatesAutoresizingMaskIntoConstraints="NO" id="O1P-gK-hbP">
-                                <rect key="frame" x="0.0" y="76" width="768" height="948"/>
+                                <rect key="frame" x="0.0" y="115" width="393" height="703"/>
                                 <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <prototypes>
                                     <tableViewCell contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="EnumSelectorCell" id="bae-sl-DbK" customClass="EnumSelectorCell">
-                                        <rect key="frame" x="0.0" y="50" width="768" height="44"/>
+                                        <rect key="frame" x="0.0" y="50" width="393" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="bae-sl-DbK" id="FgK-hs-kBJ">
-                                            <rect key="frame" x="0.0" y="0.0" width="768" height="44"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="393" height="44"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Qm5-av-MgR" customClass="RTLabel">
-                                                    <rect key="frame" x="15" y="5" width="706" height="34"/>
+                                                    <rect key="frame" x="15" y="5" width="327" height="34"/>
                                                     <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                 </view>
                                             </subviews>
@@ -975,22 +948,23 @@
                                 </connections>
                             </tableView>
                             <searchBar contentMode="redraw" placeholder="KEYWORDS" translatesAutoresizingMaskIntoConstraints="NO" id="8tc-Zi-o4x">
-                                <rect key="frame" x="0.0" y="20" width="768" height="56"/>
+                                <rect key="frame" x="0.0" y="59" width="393" height="56"/>
                                 <textInputTraits key="textInputTraits"/>
                                 <connections>
                                     <outlet property="delegate" destination="A1a-tK-2BG" id="HpF-dm-AwJ"/>
                                 </connections>
                             </searchBar>
                         </subviews>
+                        <viewLayoutGuide key="safeArea" id="yWW-xa-x6L"/>
                         <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <constraints>
-                            <constraint firstItem="8tc-Zi-o4x" firstAttribute="leading" secondItem="U3R-Nq-VNq" secondAttribute="leading" id="5WO-cu-6LF"/>
-                            <constraint firstItem="8tc-Zi-o4x" firstAttribute="top" secondItem="1gV-A8-KPP" secondAttribute="bottom" id="CQl-Ir-ikB"/>
+                            <constraint firstItem="8tc-Zi-o4x" firstAttribute="leading" secondItem="yWW-xa-x6L" secondAttribute="leading" id="5WO-cu-6LF"/>
+                            <constraint firstItem="8tc-Zi-o4x" firstAttribute="top" secondItem="yWW-xa-x6L" secondAttribute="top" id="CQl-Ir-ikB"/>
                             <constraint firstItem="O1P-gK-hbP" firstAttribute="top" secondItem="8tc-Zi-o4x" secondAttribute="bottom" id="D7b-Kn-CeP"/>
-                            <constraint firstItem="O1P-gK-hbP" firstAttribute="leading" secondItem="U3R-Nq-VNq" secondAttribute="leading" id="EfY-Qd-pqJ"/>
-                            <constraint firstAttribute="trailing" secondItem="8tc-Zi-o4x" secondAttribute="trailing" id="OdN-xw-Ama"/>
-                            <constraint firstAttribute="trailing" secondItem="O1P-gK-hbP" secondAttribute="trailing" id="VOJ-oF-WaG"/>
-                            <constraint firstItem="obC-fO-OxK" firstAttribute="top" secondItem="O1P-gK-hbP" secondAttribute="bottom" id="vXu-cU-n6z"/>
+                            <constraint firstItem="O1P-gK-hbP" firstAttribute="leading" secondItem="yWW-xa-x6L" secondAttribute="leading" id="EfY-Qd-pqJ"/>
+                            <constraint firstItem="yWW-xa-x6L" firstAttribute="trailing" secondItem="8tc-Zi-o4x" secondAttribute="trailing" id="OdN-xw-Ama"/>
+                            <constraint firstItem="yWW-xa-x6L" firstAttribute="trailing" secondItem="O1P-gK-hbP" secondAttribute="trailing" id="VOJ-oF-WaG"/>
+                            <constraint firstItem="yWW-xa-x6L" firstAttribute="bottom" secondItem="O1P-gK-hbP" secondAttribute="bottom" id="vXu-cU-n6z"/>
                         </constraints>
                     </view>
                     <value key="contentSizeForViewInPopover" type="size" width="540" height="680"/>

common/customUI/commoneditor/EnumSelectViewController.h

@@ -22,7 +22,7 @@
 @property bool dirty ;
 @property int max_select ;
 @property bool is_dialog ;
-
+@property bool sys_style ;
 
 
 

common/customUI/commoneditor/EnumSelectViewController.m

@@ -55,6 +55,10 @@
                                                                                                              action:@selector( onCloseClick:)];
  //       [[UIBarButtonItem alloc] initWithTitle:NSLocalizedString(@"Close", nil) style:UIBarButtonItemStylePlain target:self action:@selector(onCloseClick:)];
         self.navi_item.rightBarButtonItem = closeButton;
+    }
+    else if(self.sys_style)
+    {
+        
     }
     else
     {
@@ -466,13 +470,14 @@
                 NSMutableDictionary* val_json = [[self.cadedate objectForKey:[NSString stringWithFormat:@"val_%d",i]] mutableCopy];
                 if(i==indexPath.row)
                 {
-                    if ([[val_json[@"check"] stringValue] isEqual:@"1"])
+                    if ([val_json[@"check"]  isEqual:@"1"])
                     {
                         //选中当前选中项时，不设脏状态
                         self.dirty=false;
                     }
                     
                     [val_json setValue:@"1" forKey:@"check"];
+                    [val_json setValue:@1 forKey:@"check1"];
                     
                 }
                 else