NPD MOBILE

添加视屏播放嵌入模板。修改MODEL DETAIL 去掉界面无用的控件

RedAnt ERP Mobile/RedAnt ERP Mobile.xcworkspace/xcuserdata/Ray.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -339,5 +339,37 @@
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/Functions/modelDetail/DetailViewController.m"
+            timestampString = "519200124.134795"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "1320"
+            endingLineNumber = "1320"
+            landmarkName = "-tableView:cellForRowAtIndexPath:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/Functions/modelDetail/DetailViewController.m"
+            timestampString = "519207412.75191"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "1321"
+            endingLineNumber = "1321"
+            landmarkName = "-tableView:cellForRowAtIndexPath:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
    </Breakpoints>
 </Bucket>

RedAnt ERP Mobile/common/Functions/modelDetail/DetailHeaderCell.h

@@ -73,7 +73,7 @@
 @property (strong, nonatomic) IBOutlet UILabel *incoming_stock_label;
 
 @property (strong, nonatomic) IBOutlet UILabel *etaval_label;
-@property (strong, nonatomic) IBOutlet UIImageView *qrcode_imageview;
+//@property (strong, nonatomic) IBOutlet UIImageView *qrcode_imageview;
 @property (strong, nonatomic) IBOutlet UILabel *model_label;
 
 @property (strong, nonatomic) IBOutlet UILabel *cqyt_label;

RedAnt ERP Mobile/common/photoStack/PhotoStackView.m

@@ -340,6 +340,7 @@ static CGFloat const PhotoRotationOffsetDefault = 4.0f;
         
         for (NSUInteger index = 0; index < numberOfPhotos; index++) {
 
+            
             UIImage *image = [self.dataSource photoStackView:self photoForIndex:index];
             CGSize imageSize = image.size;
             if([self.dataSource respondsToSelector:@selector(photoStackView:photoSizeForIndex:)]){

RedAnt ERP Mobile/iSales-NPD.xcodeproj/project.pbxproj

@@ -71,6 +71,7 @@
 		712AFEE21DBA077F00254965 /* pdfCreator.m in Sources */ = {isa = PBXBuildFile; fileRef = 712AFEE11DBA077F00254965 /* pdfCreator.m */; };
 		712AFEE51DBDAF0300254965 /* pdfcreator.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 712AFEE41DBDAF0300254965 /* pdfcreator.xcassets */; };
 		712AFEE71DBDB48000254965 /* portfolio_3x2.json in Resources */ = {isa = PBXBuildFile; fileRef = 712AFEE61DBDB48000254965 /* portfolio_3x2.json */; };
+		712BA22D1EF2847600EC1571 /* video.html in Resources */ = {isa = PBXBuildFile; fileRef = 712BA22C1EF2847600EC1571 /* video.html */; };
 		712BABF31C897E3A0007466B /* CategorySearchFilterViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 712BABF21C897E3A0007466B /* CategorySearchFilterViewController.m */; };
 		712C40B61C7310F4000E6831 /* CartGeneralNotesViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 712C40B51C7310F4000E6831 /* CartGeneralNotesViewController.m */; };
 		712C40B91C731126000E6831 /* ItemNotesViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 712C40B81C731126000E6831 /* ItemNotesViewController.m */; };
@@ -381,6 +382,7 @@
 		712AFEE11DBA077F00254965 /* pdfCreator.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = pdfCreator.m; path = common/pdfCreator/pdfCreator.m; sourceTree = SOURCE_ROOT; };
 		712AFEE41DBDAF0300254965 /* pdfcreator.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = pdfcreator.xcassets; sourceTree = "<group>"; };
 		712AFEE61DBDB48000254965 /* portfolio_3x2.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = portfolio_3x2.json; sourceTree = "<group>"; };
+		712BA22C1EF2847600EC1571 /* video.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = video.html; sourceTree = "<group>"; };
 		712BABF11C897E3A0007466B /* CategorySearchFilterViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CategorySearchFilterViewController.h; path = common/Functions/category/CategorySearchFilterViewController.h; sourceTree = SOURCE_ROOT; };
 		712BABF21C897E3A0007466B /* CategorySearchFilterViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CategorySearchFilterViewController.m; path = common/Functions/category/CategorySearchFilterViewController.m; sourceTree = SOURCE_ROOT; };
 		712C40B41C7310F4000E6831 /* CartGeneralNotesViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CartGeneralNotesViewController.h; path = common/Functions/cart/CartGeneralNotesViewController.h; sourceTree = SOURCE_ROOT; };
@@ -1387,6 +1389,7 @@
 		716387D2195408DA006E65E6 /* config */ = {
 			isa = PBXGroup;
 			children = (
+				712BA22C1EF2847600EC1571 /* video.html */,
 				716387D3195408E7006E65E6 /* config.h */,
 				71E5A00F1DC99370005BF655 /* config.plist */,
 			);
@@ -1829,6 +1832,7 @@
 				42A51BF61D62F9AB00F13667 /* orderDetail.json in Resources */,
 				7161FEB71D61B24900157EE1 /* orderinfo.html in Resources */,
 				42C9FB151D5B28FA001DCA8B /* contactAdvanceSearch.json in Resources */,
+				712BA22D1EF2847600EC1571 /* video.html in Resources */,
 				7161FEB51D61B24900157EE1 /* creditcardpayment.html in Resources */,
 				71777FC61C8AC97300DA2511 /* debug_category_filter.json in Resources */,
 				71073AE61DD41DD8001BC653 /* so_thumb.json in Resources */,

RedAnt ERP Mobile/iSales-NPD/Base.lproj/Main.storyboard

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="12120" systemVersion="16A323" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none" colorMatched="YES" initialViewController="jsC-F8-zYF">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="12120" systemVersion="16F73" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none" colorMatched="YES" initialViewController="jsC-F8-zYF">
     <device id="ipad9_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
@@ -1044,11 +1044,6 @@
                                                     <rect key="frame" x="35" y="108" width="349" height="348"/>
                                                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
                                                 </view>
-                                                <imageView hidden="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" id="L3L-K2-xev">
-                                                    <rect key="frame" x="295" y="369" width="80" height="80"/>
-                                                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                                    <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                                                </imageView>
                                                 <button opaque="NO" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="IRl-nF-CWX">
                                                     <rect key="frame" x="215" y="420" width="167" height="30"/>
                                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
@@ -1216,7 +1211,6 @@
                                             <outlet property="priceLabel" destination="fD8-Km-IT3" id="KJA-dI-71O"/>
                                             <outlet property="property_nameLabel" destination="v0v-80-iIZ" id="o0x-Gl-UCM"/>
                                             <outlet property="property_valLabel" destination="EvS-UE-8Nb" id="tHF-49-cMX"/>
-                                            <outlet property="qrcode_imageview" destination="L3L-K2-xev" id="CfK-Lz-cs7"/>
                                             <outlet property="quantity_text" destination="aRf-kp-OGg" id="rgW-mP-5hT"/>
                                             <outlet property="selector_Button" destination="FwX-9Z-HgC" id="xla-FR-kaP"/>
                                             <outlet property="selector_dorpdown" destination="tGi-MX-FEf" id="P8m-Vk-5Uh"/>

RedAnt ERP Mobile/iSales-NPD/Base.lproj/OLM.storyboard

@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="11201" systemVersion="16A323" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="12120" systemVersion="16F73" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none" colorMatched="YES">
+    <device id="ipad9_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11161"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12088"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
@@ -15,87 +18,87 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Enable offline mode" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="iMj-3v-3eE">
-                                <frame key="frameInset" minX="20" minY="25" width="181" height="21"/>
+                                <rect key="frame" x="20" y="25" width="181" height="21"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                 <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>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Use internal address" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Baf-ru-Ueq">
-                                <frame key="frameInset" minX="20" minY="76" width="173" height="21"/>
+                                <rect key="frame" x="20" y="76" width="173" height="21"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                 <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" id="9fI-uo-0D5">
-                                <frame key="frameInset" minX="217" minY="20" width="51" height="31"/>
+                                <rect key="frame" x="217" y="20" width="51" height="31"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                 <connections>
                                     <action selector="onChangeOfflineSwitch:" destination="FG7-WW-Z5X" eventType="valueChanged" id="F0c-jb-lQb"/>
                                 </connections>
                             </switch>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Last sync" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="o7T-n9-rhA">
-                                <frame key="frameInset" minX="20" minY="119" width="91" height="21"/>
+                                <rect key="frame" x="20" y="119" width="91" height="21"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                 <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>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="mAv-YK-pnD">
-                                <frame key="frameInset" minX="217" minY="119" width="179" height="21"/>
+                                <rect key="frame" x="217" y="119" width="179" height="21"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                 <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>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Cache size" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="4VN-I0-qDk">
-                                <frame key="frameInset" minX="20" minY="168" width="91" height="21"/>
+                                <rect key="frame" x="20" y="168" width="91" height="21"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                 <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>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="Version" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="kcI-2q-g1r">
-                                <frame key="frameInset" minX="20" minY="217" width="91" height="21"/>
+                                <rect key="frame" x="20" y="217" width="91" height="21"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                 <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>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="Unlock offline" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="MNF-V6-2fB">
-                                <frame key="frameInset" minX="20" minY="266" width="106" height="21"/>
+                                <rect key="frame" x="20" y="266" width="106" height="21"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                 <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>
                             <button hidden="YES" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="Kdt-hI-Mna">
-                                <frame key="frameInset" minY="212" width="85" height="30" maxX="20"/>
+                                <rect key="frame" x="663" y="212" width="85" height="30"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
                                 <state key="normal" title="Submit local"/>
                             </button>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="3.22GB" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="J6c-cK-Ihd">
-                                <frame key="frameInset" minX="217" minY="168" width="111" height="21"/>
+                                <rect key="frame" x="217" y="168" width="111" height="21"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                 <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>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="20160228231919" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Avj-sE-gE6">
-                                <frame key="frameInset" minX="217" minY="217" width="147" height="21"/>
+                                <rect key="frame" x="217" y="217" width="147" height="21"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                 <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>
                             <button hidden="YES" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="Vzg-50-bc2">
-                                <frame key="frameInset" minY="164" width="82" height="30" maxX="20"/>
+                                <rect key="frame" x="666" y="164" width="82" height="30"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
                                 <state key="normal" title="Clear cache"/>
                             </button>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="jns-5C-X4w">
-                                <frame key="frameInset" minY="115" width="132" height="30" maxX="20"/>
+                                <rect key="frame" x="616" y="115" width="132" height="30"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
                                 <state key="normal" title="Sync"/>
                                 <connections>
@@ -103,11 +106,11 @@
                                 </connections>
                             </button>
                             <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" id="lgu-mf-cTC">
-                                <frame key="frameInset" minX="217" minY="71" width="51" height="31"/>
+                                <rect key="frame" x="217" y="71" width="51" height="31"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                             </switch>
                             <button opaque="NO" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="cIN-uF-BHa">
-                                <frame key="frameInset" minY="262" width="82" height="30" maxX="20"/>
+                                <rect key="frame" x="666" y="262" width="82" height="30"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
                                 <state key="normal" title="Unlock"/>
                                 <connections>
@@ -155,36 +158,36 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Progress" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="k2H-8o-P97">
-                                <frame key="frameInset" minX="20" minY="64" width="68" height="21"/>
+                                <rect key="frame" x="20" y="64" width="68" height="21"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                 <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>
                             <progressView opaque="NO" contentMode="scaleToFill" verticalHuggingPriority="750" id="qll-0O-PAI">
-                                <frame key="frameInset" minX="20" minY="93" height="2" maxX="20"/>
+                                <rect key="frame" x="20" y="93" width="728" height="2"/>
                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
                             </progressView>
                             <progressView opaque="NO" contentMode="scaleToFill" verticalHuggingPriority="750" id="jJD-lt-Uuj">
-                                <frame key="frameInset" minX="20" minY="132" height="2" maxX="20"/>
+                                <rect key="frame" x="20" y="132" width="728" height="2"/>
                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
                             </progressView>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Overall progress" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="6P9-Se-W27">
-                                <frame key="frameInset" minX="20" minY="103" width="126" height="21"/>
+                                <rect key="frame" x="20" y="103" width="126" height="21"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                 <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>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="sEa-AW-QiJ">
-                                <frame key="frameInset" minX="219" minY="20" height="24" maxX="219"/>
+                                <rect key="frame" x="219" y="20" width="330" height="24"/>
                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="20"/>
                                 <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <nil key="highlightedColor"/>
                             </label>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="right" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="0lX-Gd-bGG">
-                                <frame key="frameInset" width="109" height="30" maxX="20" maxY="20"/>
+                                <rect key="frame" x="639" y="974" width="109" height="30"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/>
                                 <state key="normal" title="Send log"/>
                                 <connections>
@@ -192,7 +195,7 @@
                                 </connections>
                             </button>
                             <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" textAlignment="natural" id="e3H-tp-xCS">
-                                <frame key="frameInset" minX="20" minY="151" maxX="20" maxY="58"/>
+                                <rect key="frame" x="20" y="151" width="728" height="815"/>
                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                 <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
@@ -220,7 +223,7 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="68" sectionHeaderHeight="28" sectionFooterHeight="28" id="lRS-dn-XTu">
-                                <frame key="frameInset" maxY="90"/>
+                                <rect key="frame" x="0.0" y="0.0" width="768" height="934"/>
                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                 <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <prototypes>
@@ -228,34 +231,34 @@
                                         <rect key="frame" x="0.0" y="28" width="768" height="86"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="XXr-fU-67o" id="Ohn-hG-mj9">
-                                            <frame key="frameInset" width="768" height="85.5"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="768" height="86"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="AIn-eK-sCn">
-                                                    <frame key="frameInset" minX="20" minY="15" width="712" height="21"/>
+                                                    <rect key="frame" x="20" y="15" width="712" height="21"/>
                                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                                     <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>
                                                 <button hidden="YES" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="hrK-DY-RbO">
-                                                    <frame key="frameInset" minX="10" minY="32" width="21" height="21"/>
+                                                    <rect key="frame" x="10" y="32" width="21" height="21"/>
                                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                                    <state key="normal" image="5EAA396F-78E1-4A79-BFA4-49DC0A9ED42E"/>
-                                                    <state key="selected" image="E92EB74B-9217-46B9-9AC1-909020CAC00F"/>
+                                                    <state key="normal" image="button:hrK-DY-RbO:image"/>
+                                                    <state key="selected" image="756ABE2D-369C-4EF1-B698-CCE6116D5A54"/>
                                                     <connections>
                                                         <action selector="checkButtonClick:" destination="XXr-fU-67o" eventType="touchUpInside" id="KeU-ld-H4J"/>
                                                     </connections>
                                                 </button>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="v9S-8N-eqS">
-                                                    <frame key="frameInset" minX="20" width="60.83%" height="22" maxY="15.5"/>
+                                                    <rect key="frame" x="20" y="48" width="455" height="22"/>
                                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES"/>
                                                     <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>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="11/08/2016 17:55:32 PST" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="efa-f8-yHS">
-                                                    <frame key="frameInset" width="200" height="22" maxY="14.5"/>
+                                                    <rect key="frame" x="568" y="49" width="200" height="22"/>
                                                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                     <nil key="textColor"/>
@@ -277,7 +280,7 @@
                                 </connections>
                             </tableView>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="NKA-5N-u0m">
-                                <frame key="frameInset" width="156" height="30" maxY="20"/>
+                                <rect key="frame" x="612" y="974" width="156" height="30"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/>
                                 <state key="normal" image="btn_ok"/>
                                 <connections>
@@ -305,7 +308,7 @@
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                         <subviews>
                             <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="User" minimumFontSize="17" id="OGq-ht-S8t">
-                                <frame key="frameInset" minX="60" minY="103" height="30" maxX="60"/>
+                                <rect key="frame" x="60" y="103" width="360" height="30"/>
                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
                                 <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
@@ -315,14 +318,14 @@
                                 </connections>
                             </textField>
                             <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="Password" minimumFontSize="17" id="l8b-7U-g6s">
-                                <frame key="frameInset" minX="60" minY="142" height="30" maxX="60"/>
+                                <rect key="frame" x="60" y="142" width="360" height="30"/>
                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
                                 <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                 <textInputTraits key="textInputTraits" secureTextEntry="YES"/>
                             </textField>
                             <button hidden="YES" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="rMJ-4V-e3C">
-                                <frame key="frameInset" minX="60" minY="196" width="154" height="22"/>
+                                <rect key="frame" x="60" y="196" width="154" height="22"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                 <inset key="contentEdgeInsets" minX="4" minY="0.0" maxX="0.0" maxY="0.0"/>
                                 <inset key="imageEdgeInsets" minX="-4" minY="0.0" maxX="0.0" maxY="0.0"/>
@@ -332,7 +335,7 @@
                                 </state>
                             </button>
                             <button hidden="YES" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="6lu-Dw-7uZ">
-                                <frame key="frameInset" minX="295" minY="196" width="125" height="22"/>
+                                <rect key="frame" x="295" y="196" width="125" height="22"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                 <inset key="contentEdgeInsets" minX="4" minY="0.0" maxX="0.0" maxY="0.0"/>
                                 <inset key="imageEdgeInsets" minX="-4" minY="0.0" maxX="0.0" maxY="0.0"/>
@@ -342,14 +345,14 @@
                                 </state>
                             </button>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Unlock offline" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="DWa-JA-ah5">
-                                <frame key="frameInset" minX="60" minY="67" width="124" height="26"/>
+                                <rect key="frame" x="60" y="67" width="124" height="26"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="20"/>
                                 <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <nil key="highlightedColor"/>
                             </label>
                             <button hidden="YES" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="right" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="snZ-xL-t2m">
-                                <frame key="frameInset" minY="65" width="172" height="30" maxX="60"/>
+                                <rect key="frame" x="248" y="65" width="172" height="30"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
                                 <state key="normal" title="Retrieve password">
                                     <color key="titleColor" red="0.59999999999999998" green="0.40000000000000002" blue="0.20000000000000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -357,7 +360,7 @@
                                 </state>
                             </button>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="06f-pS-V71">
-                                <frame key="frameInset" minY="267" width="102" height="36" maxX="20"/>
+                                <rect key="frame" x="358" y="267" width="102" height="36"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="20"/>
                                 <state key="normal" title="Unlock">
@@ -374,7 +377,7 @@
                                 </connections>
                             </button>
                             <tableView hidden="YES" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="28" sectionFooterHeight="28" id="wA2-4c-W2N">
-                                <frame key="frameInset" minX="60" minY="133" width="360" height="129"/>
+                                <rect key="frame" x="60" y="133" width="360" height="129"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                 <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <prototypes>
@@ -382,11 +385,11 @@
                                         <rect key="frame" x="0.0" y="28" width="360" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="0HM-qr-ZyP" id="qg6-aD-3QW">
-                                            <frame key="frameInset" width="360" height="43"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="360" height="44"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Title" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="hql-hH-AXh">
-                                                    <frame key="frameInset" minX="15" width="330" height="44"/>
+                                                    <rect key="frame" x="15" y="0.0" width="330" height="44"/>
                                                     <autoresizingMask key="autoresizingMask"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="16"/>
                                                     <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -422,50 +425,50 @@
         </scene>
     </scenes>
     <resources>
-        <image name="5EAA396F-78E1-4A79-BFA4-49DC0A9ED42E" width="24" height="24">
+        <image name="756ABE2D-369C-4EF1-B698-CCE6116D5A54" width="24" height="24">
             <mutableData key="keyedArchiveRepresentation">
 YnBsaXN0MDDUAQIDBAUGPT5YJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3ASAAGGoK4HCBMU
 GR4fIyQrLjE3OlUkbnVsbNUJCgsMDQ4PEBESVk5TU2l6ZVYkY2xhc3NcTlNJbWFnZUZsYWdzVk5TUmVw
 c1dOU0NvbG9ygAKADRIgwAAAgAOAC1h7MjQsIDI0fdIVChYYWk5TLm9iamVjdHOhF4AEgArSFQoaHaIb
 HIAFgAaACRAA0iAKISJfEBROU1RJRkZSZXByZXNlbnRhdGlvboAHgAhPERGeTU0AKgAACQgAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA8NCxQzMCw/YVxYdYaAeqCHgHuiZF1adzUyL0IPDg0WAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgHBspdW9t
-h7m1scjY1NPh4N3d5d/d2+Pd3dzi39/d5djV1OG6t7PLeXRwiyMhHi0AAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAABAMDB2BbV3PIw8HY4+Ph59/g4ODc3N3d29vb29vb29vb29vb29vb
-29zc3Nzf4ODg4uLh5srIxNpmYV55BgUECgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJCQcOh4J9
-m9/d3ejf39/f29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb297f39/h4N3pj4iE
-owwLCRAAAAAAAAAAAAAAAAAAAAAAAAAAAAUEBAiGgH2b4+Ph6dzc3Nzb29vb29vb29vb29vb29vb29vb
-29vb29vb29vb29vb29vb29vb29vb29vb29vb29vc3Nzc5OPi6I+IhaMHBgUKAAAAAAAAAAAAAAAAAAAA
-AF5aVnDf3t3o3Nzd3dvb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb
-29vb29vb29vb3Nzc3OLf3uhnYV16AAAAAAAAAAAAAAAAHhsZJ8fCvtfe39/f29vb29vb29vb29vb29vb
-29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb297e39/NycXbJCEf
-LgAAAAAAAAAAcmxphOPj4efb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb
-29vb29vb29vb29vb29vb29vb29vb29vb29vb29vi4uLme3ZyjgAAAAANDAkSt7Oux+Dh4OHb29vb29vb
-29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb
-29vb29vf3+DgvLi0zRAPDRcvLCk81tPR4Nzd3d3b29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb
-29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vc3N3d2dXT4jk0MkZcVlFv393c
-5dvb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb
-29vb29vb29vb29vb29vb29vb29vb4N/d5WljXn13cGyO39/f5Nvb29vb29vb29vb29vb29vb29vb29vb
-29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29va
-37CnntV3cGyO39/f5Nvb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb
-29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29va37CnntVcVlFv393c5dvb29vb29vb29vb
-29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb
-29vb29vb29vb4N/d5WljXn0vLCk81tPR4Nzd3d3b29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb
-29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vc3N3d2dXT4jk2MUYNDAkSt7Ou
-x+Dh4OHb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb
-29vb29vb29vb29vb29vb29vf3+DgvLi0zRAPDhcAAAAAcmxphOPj4efb29vb29vb29vb29vb29vb29vb
-29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vi4uLme3Zy
-jgAAAAAAAAAAHhsZJ8fCvtfe39/f29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb
-29vb29vb29vb29vb29vb29vb29vb29vb297e39/MycXcJCEfLgAAAAAAAAAAAAAAAF5aVnDf3t3o3Nzd
-3dvb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb3Nzc
-3OLf3uhnYV16AAAAAAAAAAAAAAAAAAAAAAUEBAiGgH2b4+Ph6dzc3Nzb29vb29vb29vb29vb29vb29vb
-29vb29vb29vb29vb29vb29vb29vb29vb29vb29vc3Nzc5OPi6I+IhaMHBgUKAAAAAAAAAAAAAAAAAAAA
-AAAAAAAJCQgOh4J9m9/d3ejf39/f29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb
-297f39/h4N3pj4iEowwLCRAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAMDB2BbV3PIw8HY4+Ph
-59/g4ODc3N3d29vb29vb29vb29vb29vb29zc3Nzf4ODg4uLh5srIxNpmYV55BgUECgAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgHBspdW9th7m1scjY1NPh393d5d/f3+Tf39/k393d
-5djV1OG6t7PLeXNwiyMhHi0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAA8NCxQzMCw/YlxZdX13cpV+eHKWZF5adzUyL0IPDg0WAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcHBxcVFRVIKSkpgkdHR+NISEjnKSkphRcXF0sICAgZAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAANDQ0tLi4u
+k0ZGRt9QUFD/UlJS/1BQUP9QUFD/UlJS/1BQUP9HR0fgLy8vlw8PDzEAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAgICCCcnJ31LS0vuU1NT/1FRUf9PT0//T09P/09PT/9PT0//T09P
+/09PT/9RUVH/U1NT/0xMTPEoKCiEAwMDCwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEBAQQNjY2
+q1NTU/9QUFD/T09P/09PT/9PT0//T09P/09PT/9PT0//T09P/09PT/9PT0//T09P/1BQUP9TU1P/ODg4
+sgYGBhQAAAAAAAAAAAAAAAAAAAAAAAAAAAICAgk2NjarVFRU/09PT/9PT0//T09P/09PT/9PT0//T09P
+/09PT/9PT0//T09P/09PT/9PT0//T09P/09PT/9OTk7/UVFR/zg4OLMDAwMLAAAAAAAAAAAAAAAAAAAA
+ACYmJnxTU1P/T09P/09PT/9PT0//T09P/09PT/9PT0//T09P/09PT/9PT0//T09P/09PT/9PT0//T09P
+/0xMTP9WVlb/X19f/1JSUv8oKCiGAAAAAAAAAAAAAAAADAwMK0pKSu5QUFD/T09P/09PT/9PT0//T09P
+/09PT/9PT0//T09P/09PT/9PT0//T09P/09PT/9PT0//SkpK/29vb//Z2dn/7+/v/5KSkv9ISEjyDw8P
+MwAAAAAAAAAALS0tklNTU/9PT0//T09P/09PT/9PT0//T09P/09PT/9PT0//T09P/09PT/9PT0//T09P
+/09PT/9KSkr/cHBw/+np6f///////////8fHx/9PT0//MDAwnAAAAAAGBgYVRUVF3lFRUf9OTk7/SkpK
+/0pKSv9OTk7/T09P/09PT/9PT0//T09P/09PT/9PT0//T09P/0pKSv9wcHD/6enp////////////+/v7
+/4eHh/9NTU3/R0dH5QgICBoUFBRET09P/E5OTv9TU1P/lZWV/52dnf9TU1P/TU1N/09PT/9PT0//T09P
+/09PT/9PT0//SkpK/3BwcP/q6ur////////////8/Pz/lZWV/0xMTP9PT0//UFBQ/xgYGFAmJiZ8UlJS
+/0pKSv+cnJz///////////+3t7f/UFBQ/01NTf9PT0//T09P/09PT/9KSkr/cHBw/+rq6v//////////
+//z8/P+Wlpb/S0tL/05OTv9PT0//UlJS/y8vL5YwMDCbUlJS/0tLS/+xsbH/////////////////t7e3
+/1BQUP9NTU3/T09P/0pKSv9wcHD/6urq/////////////Pz8/5aWlv9LS0v/Tk5O/09PT/9PT0//T09P
+/0xMTPswMDCbUlJS/01NTf9ZWVn/ysrK/////////////////7u7u/9RUVH/R0dH/3BwcP/s7Oz/////
+///////8/Pz/k5OT/0tLS/9OTk7/T09P/09PT/9PT0//T09P/0xMTPsmJiZ8UlJS/09PT/9MTEz/WFhY
+/8rKyv////////////////+3t7f/dnZ2/+rq6v////////////z8/P+Tk5P/S0tL/05OTv9PT0//T09P
+/09PT/9PT0//UlJS/y8vL5YUFBRET09P/FBQUP9PT0//TExM/1hYWP/Lysr/////////////////+vr6
+/////////////Pz8/5OTk/9LS0v/Tk5O/09PT/9PT0//T09P/09PT/9PT0//UFBQ/xgYGFAGBgYVRUVF
+3lFRUf9PT0//T09P/0xMTP9YWFj/y8vK///////////////////////8/Pz/k5OT/0tLS/9OTk7/T09P
+/09PT/9PT0//T09P/09PT/9RUVH/R0dH5QgICBoAAAAALS0tklNTU/9PT0//T09P/09PT/9NTU3/WFhY
+/8vKyv////////////7+/v+RkZH/S0tL/05OTv9PT0//T09P/09PT/9PT0//T09P/09PT/9TU1P/MDAw
+nAAAAAAAAAAADAwMK0pKSu5QUFD/T09P/09PT/9PT0//TExM/1hYWP/FxcX/7Ozs/5CQkP9LS0v/Tk5O
+/09PT/9PT0//T09P/09PT/9PT0//T09P/1BQUP9MTEzyDw8PMwAAAAAAAAAAAAAAACYmJnxTU1P/T09P
+/09PT/9PT0//T09P/01NTf9SUlL/XV1d/0xMTP9PT0//T09P/09PT/9PT0//T09P/09PT/9PT0//T09P
+/1NTU/8oKCiGAAAAAAAAAAAAAAAAAAAAAAICAgk2NjarVFRU/09PT/9PT0//T09P/09PT/9OTk7/TU1N
+/09PT/9PT0//T09P/09PT/9PT0//T09P/09PT/9PT0//VFRU/zg4OLMDAwMLAAAAAAAAAAAAAAAAAAAA
+AAAAAAAEBAQQNjY2q1NTU/9QUFD/T09P/09PT/9PT0//T09P/09PT/9PT0//T09P/09PT/9PT0//T09P
+/1BQUP9TU1P/ODg4sgYGBhQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgICCCcnJ31LS0vuU1NT
+/1FRUf9PT0//T09P/09PT/9PT0//T09P/09PT/9RUVH/U1NT/0xMTPEoKCiEAwMDCwAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAANDQ0tLi4uk0ZGRt9QUFD/UlJS/1JSUv9SUlL/UlJS
+/1BQUP9HR0fgLy8vlw8PDzEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAcHBxcWFhZJKSkpgjExMZ0xMTGdKSkphRcXF0wICAgZAAAAAAAAAAAAAAAAAAAA
 AAAAAAAAAAAAAAAAAAAAAAAADgEAAAMAAAABABgAAAEBAAMAAAABABgAAAECAAMAAAAEAAAJtgEDAAMA
 AAABAAEAAAEGAAMAAAABAAIAAAERAAQAAAABAAAACAESAAMAAAABAAEAAAEVAAMAAAABAAQAAAEWAAMA
 AAABABgAAAEXAAQAAAABAAAJAAEcAAMAAAABAAEAAAFSAAMAAAABAAEAAAFTAAMAAAAEAAAJvodzAAcA
@@ -512,50 +515,51 @@ EvIS+hMHEwwTDhMQExUTHRMgEyUTLRMwE0ITRRNKAAAAAAAAAgEAAAAAAAAAQQAAAAAAAAAAAAAAAAAA
 E0w
 </mutableData>
         </image>
-        <image name="E92EB74B-9217-46B9-9AC1-909020CAC00F" width="24" height="24">
+        <image name="btn_ok" width="102" height="30"/>
+        <image name="button:hrK-DY-RbO:image" width="24" height="24">
             <mutableData key="keyedArchiveRepresentation">
 YnBsaXN0MDDUAQIDBAUGPT5YJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3ASAAGGoK4HCBMU
 GR4fIyQrLjE3OlUkbnVsbNUJCgsMDQ4PEBESVk5TU2l6ZVYkY2xhc3NcTlNJbWFnZUZsYWdzVk5TUmVw
 c1dOU0NvbG9ygAKADRIgwAAAgAOAC1h7MjQsIDI0fdIVChYYWk5TLm9iamVjdHOhF4AEgArSFQoaHaIb
 HIAFgAaACRAA0iAKISJfEBROU1RJRkZSZXByZXNlbnRhdGlvboAHgAhPERGeTU0AKgAACQgAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcHBxcVFRVIKSkpgkdHR+NISEjnKSkphRcXF0sICAgZAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAANDQ0tLi4u
-k0ZGRt9QUFD/UlJS/1BQUP9QUFD/UlJS/1BQUP9HR0fgLy8vlw8PDzEAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAgICCCcnJ31LS0vuU1NT/1FRUf9PT0//T09P/09PT/9PT0//T09P
-/09PT/9RUVH/U1NT/0xMTPEoKCiEAwMDCwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEBAQQNjY2
-q1NTU/9QUFD/T09P/09PT/9PT0//T09P/09PT/9PT0//T09P/09PT/9PT0//T09P/1BQUP9TU1P/ODg4
-sgYGBhQAAAAAAAAAAAAAAAAAAAAAAAAAAAICAgk2NjarVFRU/09PT/9PT0//T09P/09PT/9PT0//T09P
-/09PT/9PT0//T09P/09PT/9PT0//T09P/09PT/9OTk7/UVFR/zg4OLMDAwMLAAAAAAAAAAAAAAAAAAAA
-ACYmJnxTU1P/T09P/09PT/9PT0//T09P/09PT/9PT0//T09P/09PT/9PT0//T09P/09PT/9PT0//T09P
-/0xMTP9WVlb/X19f/1JSUv8oKCiGAAAAAAAAAAAAAAAADAwMK0pKSu5QUFD/T09P/09PT/9PT0//T09P
-/09PT/9PT0//T09P/09PT/9PT0//T09P/09PT/9PT0//SkpK/29vb//Z2dn/7+/v/5KSkv9ISEjyDw8P
-MwAAAAAAAAAALS0tklNTU/9PT0//T09P/09PT/9PT0//T09P/09PT/9PT0//T09P/09PT/9PT0//T09P
-/09PT/9KSkr/cHBw/+np6f///////////8fHx/9PT0//MDAwnAAAAAAGBgYVRUVF3lFRUf9OTk7/SkpK
-/0pKSv9OTk7/T09P/09PT/9PT0//T09P/09PT/9PT0//T09P/0pKSv9wcHD/6enp////////////+/v7
-/4eHh/9NTU3/R0dH5QgICBoUFBRET09P/E5OTv9TU1P/lZWV/52dnf9TU1P/TU1N/09PT/9PT0//T09P
-/09PT/9PT0//SkpK/3BwcP/q6ur////////////8/Pz/lZWV/0xMTP9PT0//UFBQ/xgYGFAmJiZ8UlJS
-/0pKSv+cnJz///////////+3t7f/UFBQ/01NTf9PT0//T09P/09PT/9KSkr/cHBw/+rq6v//////////
-//z8/P+Wlpb/S0tL/05OTv9PT0//UlJS/y8vL5YwMDCbUlJS/0tLS/+xsbH/////////////////t7e3
-/1BQUP9NTU3/T09P/0pKSv9wcHD/6urq/////////////Pz8/5aWlv9LS0v/Tk5O/09PT/9PT0//T09P
-/0xMTPswMDCbUlJS/01NTf9ZWVn/ysrK/////////////////7u7u/9RUVH/R0dH/3BwcP/s7Oz/////
-///////8/Pz/k5OT/0tLS/9OTk7/T09P/09PT/9PT0//T09P/0xMTPsmJiZ8UlJS/09PT/9MTEz/WFhY
-/8rKyv////////////////+3t7f/dnZ2/+rq6v////////////z8/P+Tk5P/S0tL/05OTv9PT0//T09P
-/09PT/9PT0//UlJS/y8vL5YUFBRET09P/FBQUP9PT0//TExM/1hYWP/Lysr/////////////////+vr6
-/////////////Pz8/5OTk/9LS0v/Tk5O/09PT/9PT0//T09P/09PT/9PT0//UFBQ/xgYGFAGBgYVRUVF
-3lFRUf9PT0//T09P/0xMTP9YWFj/y8vK///////////////////////8/Pz/k5OT/0tLS/9OTk7/T09P
-/09PT/9PT0//T09P/09PT/9RUVH/R0dH5QgICBoAAAAALS0tklNTU/9PT0//T09P/09PT/9NTU3/WFhY
-/8vKyv////////////7+/v+RkZH/S0tL/05OTv9PT0//T09P/09PT/9PT0//T09P/09PT/9TU1P/MDAw
-nAAAAAAAAAAADAwMK0pKSu5QUFD/T09P/09PT/9PT0//TExM/1hYWP/FxcX/7Ozs/5CQkP9LS0v/Tk5O
-/09PT/9PT0//T09P/09PT/9PT0//T09P/1BQUP9MTEzyDw8PMwAAAAAAAAAAAAAAACYmJnxTU1P/T09P
-/09PT/9PT0//T09P/01NTf9SUlL/XV1d/0xMTP9PT0//T09P/09PT/9PT0//T09P/09PT/9PT0//T09P
-/1NTU/8oKCiGAAAAAAAAAAAAAAAAAAAAAAICAgk2NjarVFRU/09PT/9PT0//T09P/09PT/9OTk7/TU1N
-/09PT/9PT0//T09P/09PT/9PT0//T09P/09PT/9PT0//VFRU/zg4OLMDAwMLAAAAAAAAAAAAAAAAAAAA
-AAAAAAAEBAQQNjY2q1NTU/9QUFD/T09P/09PT/9PT0//T09P/09PT/9PT0//T09P/09PT/9PT0//T09P
-/1BQUP9TU1P/ODg4sgYGBhQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgICCCcnJ31LS0vuU1NT
-/1FRUf9PT0//T09P/09PT/9PT0//T09P/09PT/9RUVH/U1NT/0xMTPEoKCiEAwMDCwAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAANDQ0tLi4uk0ZGRt9QUFD/UlJS/1JSUv9SUlL/UlJS
-/1BQUP9HR0fgLy8vlw8PDzEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAcHBxcWFhZJKSkpgjExMZ0xMTGdKSkphRcXF0wICAgZAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA8NCxQzMCw/YVxYdYaAeqCHgHuiZF1adzUyL0IPDg0WAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgHBspdW9t
+h7m1scjY1NPh4N3d5d/d2+Pd3dzi39/d5djV1OG6t7PLeXRwiyMhHi0AAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAABAMDB2BbV3PIw8HY4+Ph59/g4ODc3N3d29vb29vb29vb29vb29vb
+29zc3Nzf4ODg4uLh5srIxNpmYV55BgUECgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJCQcOh4J9
+m9/d3ejf39/f29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb297f39/h4N3pj4iE
+owwLCRAAAAAAAAAAAAAAAAAAAAAAAAAAAAUEBAiGgH2b4+Ph6dzc3Nzb29vb29vb29vb29vb29vb29vb
+29vb29vb29vb29vb29vb29vb29vb29vb29vb29vc3Nzc5OPi6I+IhaMHBgUKAAAAAAAAAAAAAAAAAAAA
+AF5aVnDf3t3o3Nzd3dvb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb
+29vb29vb29vb3Nzc3OLf3uhnYV16AAAAAAAAAAAAAAAAHhsZJ8fCvtfe39/f29vb29vb29vb29vb29vb
+29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb297e39/NycXbJCEf
+LgAAAAAAAAAAcmxphOPj4efb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb
+29vb29vb29vb29vb29vb29vb29vb29vb29vb29vi4uLme3ZyjgAAAAANDAkSt7Oux+Dh4OHb29vb29vb
+29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb
+29vb29vf3+DgvLi0zRAPDRcvLCk81tPR4Nzd3d3b29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb
+29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vc3N3d2dXT4jk0MkZcVlFv393c
+5dvb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb
+29vb29vb29vb29vb29vb29vb29vb4N/d5WljXn13cGyO39/f5Nvb29vb29vb29vb29vb29vb29vb29vb
+29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29va
+37CnntV3cGyO39/f5Nvb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb
+29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29va37CnntVcVlFv393c5dvb29vb29vb29vb
+29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb
+29vb29vb29vb4N/d5WljXn0vLCk81tPR4Nzd3d3b29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb
+29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vc3N3d2dXT4jk2MUYNDAkSt7Ou
+x+Dh4OHb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb
+29vb29vb29vb29vb29vb29vf3+DgvLi0zRAPDhcAAAAAcmxphOPj4efb29vb29vb29vb29vb29vb29vb
+29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vi4uLme3Zy
+jgAAAAAAAAAAHhsZJ8fCvtfe39/f29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb
+29vb29vb29vb29vb29vb29vb29vb29vb297e39/MycXcJCEfLgAAAAAAAAAAAAAAAF5aVnDf3t3o3Nzd
+3dvb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb3Nzc
+3OLf3uhnYV16AAAAAAAAAAAAAAAAAAAAAAUEBAiGgH2b4+Ph6dzc3Nzb29vb29vb29vb29vb29vb29vb
+29vb29vb29vb29vb29vb29vb29vb29vb29vb29vc3Nzc5OPi6I+IhaMHBgUKAAAAAAAAAAAAAAAAAAAA
+AAAAAAAJCQgOh4J9m9/d3ejf39/f29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb
+297f39/h4N3pj4iEowwLCRAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAMDB2BbV3PIw8HY4+Ph
+59/g4ODc3N3d29vb29vb29vb29vb29vb29zc3Nzf4ODg4uLh5srIxNpmYV55BgUECgAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgHBspdW9th7m1scjY1NPh393d5d/f3+Tf39/k393d
+5djV1OG6t7PLeXNwiyMhHi0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAA8NCxQzMCw/YlxZdX13cpV+eHKWZF5adzUyL0IPDg0WAAAAAAAAAAAAAAAAAAAA
 AAAAAAAAAAAAAAAAAAAAAAAADgEAAAMAAAABABgAAAEBAAMAAAABABgAAAECAAMAAAAEAAAJtgEDAAMA
 AAABAAEAAAEGAAMAAAABAAIAAAERAAQAAAABAAAACAESAAMAAAABAAEAAAEVAAMAAAABAAQAAAEWAAMA
 AAABABgAAAEXAAQAAAABAAAJAAEcAAMAAAABAAEAAAFSAAMAAAABAAEAAAFTAAMAAAAEAAAJvodzAAcA
@@ -602,7 +606,6 @@ EvIS+hMHEwwTDhMQExUTHRMgEyUTLRMwE0ITRRNKAAAAAAAAAgEAAAAAAAAAQQAAAAAAAAAAAAAAAAAA
 E0w
 </mutableData>
         </image>
-        <image name="btn_ok" width="102" height="30"/>
         <image name="checkbox" width="16" height="16"/>
         <image name="close" width="32" height="32"/>
     </resources>

RedAnt ERP Mobile/iSales-NPD/video.html

@@ -0,0 +1,49 @@
+
+
+<!DOVTYPE html><!--告诉解析器，解析HTML文件（这是一个HTML5文件，版本也会在这里，html默认是H5） -->
+<html><!-- html标签是最外围的标签，除了上面的解析的标签其他的都在它的内部 -->
+<head><!-- 页面的“头”，不可或缺，页面的名称，属性，等等都在他这里。 -->
+    <meta lang="en"><!-- 语言en是英语，网上有可以查到 -->
+    <meta charset="UTF-8"><!-- 解析编码推荐utf-8 -->
+    <title>video</title><!-- 页面的名称 -->
+
+    <style>
+    <!-- css样式也可以写在这里 -->
+    body{
+    margin:0;/* 外边距0 */
+    padding:0;/* 内边距0 */
+    }
+
+    
+    /* 这个规则规定了iframe父元素容器的尺寸，我们要去它的宽高比应该是 25:14 */
+.aspect-ratio {
+  position: relative;
+  width: 100%;
+  height: 100%;
+
+
+}
+
+/* 设定iframe的宽度和高度，让iframe占满整个父元素容器 */
+.aspect-ratio iframe {
+  position: absolute;
+  width: 100%;
+  height: 100%;
+  left: 0;
+  top: 0;
+
+  background-color:#ffffff;
+}
+
+
+    </style>
+</head>
+<body><!-- 页面上看到的所有东西都在这里了 -->
+
+
+<div class="aspect-ratio">
+<iframe width="854" height="480" src="https://www.youtube.com/embed/QBqowbVZDW0" frameborder="0" allowfullscreen></iframe>
+</div>
+
+</body>
+</html>