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

Raimage 1.19

iOS 16 barcode test 2
Ray Zhang 3 лет назад
Родитель
Сommit
c56dcd89ab
2 измененных файлов с 48 добавлено и 12 удалено
  1. 34 11
      common/QRCode/QRCode.storyboard
  2. 14 1
      common/QRCode/RAQRCodeScannerViewController.m

+ 34 - 11
common/QRCode/QRCode.storyboard

@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
-    <device id="retina5_5" orientation="landscape">
-        <adaptation id="fullscreen"/>
-    </device>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="21225" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+    <device id="retina5_5" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14460.20"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21207"/>
         <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>
     <scenes>
@@ -15,19 +14,36 @@
             <objects>
                 <viewController storyboardIdentifier="RAQRCodeScannerViewController" useStoryboardIdentifierAsRestorationIdentifier="YES" id="41J-NQ-wiU" customClass="RAQRCodeScannerViewController" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="aiT-qZ-M5f">
-                        <rect key="frame" x="0.0" y="0.0" width="736" height="414"/>
+                        <rect key="frame" x="0.0" y="0.0" width="414" height="736"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="D8z-rA-Qpf">
-                                <rect key="frame" x="0.0" y="0.0" width="736" height="414"/>
+                                <rect key="frame" x="0.0" y="0.0" width="414" height="736"/>
                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                             </view>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="4DJ-GK-9l9">
-                                <rect key="frame" x="0.0" y="0.0" width="736" height="414"/>
+                                <rect key="frame" x="0.0" y="0.0" width="414" height="736"/>
+                                <subviews>
+                                    <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" textAlignment="natural" translatesAutoresizingMaskIntoConstraints="NO" id="C6R-of-D7X">
+                                        <rect key="frame" x="10" y="10" width="394" height="150"/>
+                                        <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+                                        <constraints>
+                                            <constraint firstAttribute="height" constant="150" id="N45-p6-QZw"/>
+                                        </constraints>
+                                        <color key="textColor" systemColor="labelColor"/>
+                                        <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                                        <textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
+                                    </textView>
+                                </subviews>
                                 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                <constraints>
+                                    <constraint firstItem="C6R-of-D7X" firstAttribute="top" secondItem="4DJ-GK-9l9" secondAttribute="top" constant="10" id="9Z1-c3-Uek"/>
+                                    <constraint firstItem="C6R-of-D7X" firstAttribute="leading" secondItem="4DJ-GK-9l9" secondAttribute="leading" constant="10" id="lNE-lb-fyc"/>
+                                    <constraint firstAttribute="trailing" secondItem="C6R-of-D7X" secondAttribute="trailing" constant="10" id="zv8-yo-Eps"/>
+                                </constraints>
                             </view>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="vCI-Zm-N7X">
-                                <rect key="frame" x="121" y="60" width="294" height="294"/>
+                                <rect key="frame" x="70" y="161" width="274" height="274"/>
                                 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                 <constraints>
                                     <constraint firstAttribute="width" secondItem="vCI-Zm-N7X" secondAttribute="height" multiplier="1:1" id="8cj-iq-wvr"/>
@@ -45,7 +61,7 @@
                                 </variation>
                             </view>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="0ig-dn-iSa">
-                                <rect key="frame" x="596" y="177" width="60" height="60"/>
+                                <rect key="frame" x="177" y="606" width="60" height="60"/>
                                 <constraints>
                                     <constraint firstAttribute="width" constant="60" id="OkG-xs-m3c"/>
                                     <constraint firstAttribute="width" secondItem="0ig-dn-iSa" secondAttribute="height" multiplier="1:1" id="ZrC-2n-5ix"/>
@@ -65,6 +81,7 @@
                                 </connections>
                             </button>
                         </subviews>
+                        <viewLayoutGuide key="safeArea" id="TEW-wV-M4S"/>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                         <constraints>
                             <constraint firstItem="0ig-dn-iSa" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="vCI-Zm-N7X" secondAttribute="trailing" priority="999" constant="10" id="29i-AW-HSH"/>
@@ -100,7 +117,6 @@
                             <constraint firstItem="D8z-rA-Qpf" firstAttribute="height" secondItem="aiT-qZ-M5f" secondAttribute="height" id="swA-T5-xSR"/>
                             <constraint firstAttribute="bottom" secondItem="vCI-Zm-N7X" secondAttribute="bottom" constant="60" id="uOO-Nq-OMU"/>
                         </constraints>
-                        <viewLayoutGuide key="safeArea" id="TEW-wV-M4S"/>
                         <variation key="default">
                             <mask key="constraints">
                                 <exclude reference="7a1-vL-ZwM"/>
@@ -172,6 +188,7 @@
                         <outlet property="previewContainer" destination="D8z-rA-Qpf" id="XCg-1T-zSa"/>
                         <outlet property="scanBtn" destination="0ig-dn-iSa" id="JUa-KJ-cvr"/>
                         <outlet property="scanerView" destination="vCI-Zm-N7X" id="09n-Fn-vIF"/>
+                        <outlet property="tvdbg_log" destination="C6R-of-D7X" id="frq-Kt-z1e"/>
                     </connections>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="3tF-Yn-TdS" userLabel="First Responder" sceneMemberID="firstResponder"/>
@@ -181,5 +198,11 @@
     </scenes>
     <resources>
         <image name="qr_back_btn" width="30" height="30"/>
+        <systemColor name="labelColor">
+            <color red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+        </systemColor>
+        <systemColor name="systemBackgroundColor">
+            <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+        </systemColor>
     </resources>
 </document>

+ 14 - 1
common/QRCode/RAQRCodeScannerViewController.m

@@ -31,6 +31,7 @@
 @property (nonatomic,strong) CAShapeLayer *rectLayer;
 
 @property (nonatomic,assign) BOOL navigationBarStatus;
+@property (weak, nonatomic) IBOutlet UITextView *tvdbg_log;
 
 @end
 
@@ -311,6 +312,8 @@
     }
     
     NSLog(@"%@", [_output availableMetadataObjectTypes]);
+    NSString* log = [NSString stringWithFormat:@"%@ \n",[_output availableMetadataObjectTypes]];
+    self.tvdbg_log.text = [self.tvdbg_log.text stringByAppendingString:log];
     self.output.metadataObjectTypes = @[
                                         AVMetadataObjectTypeQRCode,
                                         AVMetadataObjectTypeEAN13Code,
@@ -346,12 +349,22 @@
     if (!self.scannerEnable) {
         return;
     }
-    
+    NSString* log = [NSString stringWithFormat:@"%@ \n",@"didOutputMetadataObjects"];
+    self.tvdbg_log.text = [self.tvdbg_log.text stringByAppendingString:log];
     if ([metadataObjects count] > 0) {
         [self.session stopRunning];
         
         AVMetadataMachineReadableCodeObject *metadataObject = [metadataObjects objectAtIndex:0];
+        
+        
+        log = [NSString stringWithFormat:@"type %@ \n",metadataObject.type];
+        self.tvdbg_log.text = [self.tvdbg_log.text stringByAppendingString:log];
+        
         NSString *codeValue = metadataObject.stringValue;
+        
+        
+        
+        
         if (self.QRCodeViewControllerDidCompletion) {
             self.QRCodeViewControllerDidCompletion(self, codeValue);
             if (self.navigationController) {