Browse Source

拍照完成后将参数重置,避免后续调用出错

liuql6 5 years ago
parent
commit
8ca0e53419
16 changed files with 32 additions and 22 deletions
  1. 2 2
      IPUCommon/IPUMobileFunc.framework/Headers/IPUCameraPlugin.h
  2. BIN
      IPUCommon/IPUMobileFunc.framework/IPUMobileFunc
  3. 2 2
      IPUMobileFunc/IPUMobileFunc/Camera/IPUCameraPlugin.h
  4. 12 2
      IPUMobileFunc/IPUMobileFunc/Camera/IPUCameraPlugin.m
  5. 1 1
      display-center/ReactNative/node_modules/react-native-camera/ios/RNCamera.xcodeproj/xcuserdata/benny.xcuserdatad/xcschemes/xcschememanagement.plist
  6. 1 1
      display-center/ReactNative/node_modules/react-native-gesture-handler/ios/RNGestureHandler.xcodeproj/xcuserdata/benny.xcuserdatad/xcschemes/xcschememanagement.plist
  7. 1 1
      display-center/ReactNative/node_modules/react-native-vector-icons/RNVectorIcons.xcodeproj/xcuserdata/benny.xcuserdatad/xcschemes/xcschememanagement.plist
  8. 1 1
      display-center/ReactNative/node_modules/react-native-webview/ios/RNCWebView.xcodeproj/xcuserdata/benny.xcuserdatad/xcschemes/xcschememanagement.plist
  9. 1 1
      display-center/ReactNative/node_modules/react-native/Libraries/ART/ART.xcodeproj/xcuserdata/benny.xcuserdatad/xcschemes/xcschememanagement.plist
  10. 1 1
      display-center/ReactNative/node_modules/react-native/Libraries/CameraRoll/RCTCameraRoll.xcodeproj/xcuserdata/benny.xcuserdatad/xcschemes/xcschememanagement.plist
  11. 1 1
      display-center/ReactNative/node_modules/react-native/Libraries/LinkingIOS/RCTLinking.xcodeproj/xcuserdata/benny.xcuserdatad/xcschemes/xcschememanagement.plist
  12. 1 1
      display-center/ReactNative/node_modules/react-native/Libraries/Settings/RCTSettings.xcodeproj/xcuserdata/benny.xcuserdatad/xcschemes/xcschememanagement.plist
  13. 1 1
      display-center/ReactNative/node_modules/react-native/Libraries/Text/RCTText.xcodeproj/xcuserdata/benny.xcuserdatad/xcschemes/xcschememanagement.plist
  14. 2 2
      display-center/ReactNative/node_modules/react-native/Libraries/WebSocket/RCTWebSocket.xcodeproj/xcuserdata/benny.xcuserdatad/xcschemes/xcschememanagement.plist
  15. 5 5
      display-center/ReactNative/node_modules/react-native/React/React.xcodeproj/xcuserdata/benny.xcuserdatad/xcschemes/xcschememanagement.plist
  16. BIN
      display-center/display-center.xcworkspace/xcuserdata/benny.xcuserdatad/UserInterfaceState.xcuserstate

+ 2 - 2
IPUCommon/IPUMobileFunc.framework/Headers/IPUCameraPlugin.h

@ -28,13 +28,13 @@
28 28
29 29
/// 拍照获取包含二维码的照片
30 30
/// @param param 压缩参数,可选,不传则返回图片路径以及不对图片进行压缩
31
/// {"base64" : "返回图片形式,1:base64, 0: 图片路径", "length" : "照片大小,单位kb,如400", "width" : "照片最小宽度,如300"}
31
/// {"base64" : "返回图片形式,1:图片路径, 0: base64", "length" : "照片大小,单位kb,如400", "width" : "照片最小宽度,如300"}
32 32
/// callback: {"result" : "图片base64编码或者路径", "qrcodes" : ["图片中所含二维码检测结果,如无二维码则为空字符串"]}
33 33
- (void)getQrCodePhotoViaCamera:(NSArray *)param;
34 34
35 35
/// 通过相册获取包含二维码的照片
36 36
/// @param param 压缩参数,可选,不传则返回图片路径以及不对图片进行压缩
37
/// {"base64" : "返回图片形式,1:base64, 0: 图片路径", "length" : "照片大小,单位kb,如400", "width" : "照片最小宽度,如300"}
37
/// {"base64" : "返回图片形式,1:图片路径, 0: base64", "length" : "照片大小,单位kb,如400", "width" : "照片最小宽度,如300"}
38 38
/// callback: {"result" : "图片base64编码或者路径", "qrcodes" : ["图片中所含二维码检测结果,如无二维码则为空字符串"]}
39 39
- (void)getQrCodePhotoViaLibrary:(NSArray *)param;
40 40

BIN
IPUCommon/IPUMobileFunc.framework/IPUMobileFunc


+ 2 - 2
IPUMobileFunc/IPUMobileFunc/Camera/IPUCameraPlugin.h

@ -28,13 +28,13 @@
28 28
29 29
/// 拍照获取包含二维码的照片
30 30
/// @param param 压缩参数,可选,不传则返回图片路径以及不对图片进行压缩
31
/// {"base64" : "返回图片形式,1:base64, 0: 图片路径", "length" : "照片大小,单位kb,如400", "width" : "照片最小宽度,如300"}
31
/// {"base64" : "返回图片形式,1:图片路径, 0: base64", "length" : "照片大小,单位kb,如400", "width" : "照片最小宽度,如300"}
32 32
/// callback: {"result" : "图片base64编码或者路径", "qrcodes" : ["图片中所含二维码检测结果,如无二维码则为空字符串"]}
33 33
- (void)getQrCodePhotoViaCamera:(NSArray *)param;
34 34
35 35
/// 通过相册获取包含二维码的照片
36 36
/// @param param 压缩参数,可选,不传则返回图片路径以及不对图片进行压缩
37
/// {"base64" : "返回图片形式,1:base64, 0: 图片路径", "length" : "照片大小,单位kb,如400", "width" : "照片最小宽度,如300"}
37
/// {"base64" : "返回图片形式,1:图片路径, 0: base64", "length" : "照片大小,单位kb,如400", "width" : "照片最小宽度,如300"}
38 38
/// callback: {"result" : "图片base64编码或者路径", "qrcodes" : ["图片中所含二维码检测结果,如无二维码则为空字符串"]}
39 39
- (void)getQrCodePhotoViaLibrary:(NSArray *)param;
40 40

+ 12 - 2
IPUMobileFunc/IPUMobileFunc/Camera/IPUCameraPlugin.m

@ -248,6 +248,9 @@ BOOL base64;
248 248
/* 利用摄像头拍照获取图片 */
249 249
- (void)getPhotoViaCamera:(NSArray *)param {
250 250
    base64 = NO;    // 默认使用图片路径
251
    self.detectQrcode = NO;
252
    CGFloat maxLength = 0.0;
253
    CGFloat minWidth = 0.0;
251 254
    if ([param count] && ![param[0] boolValue]) {
252 255
        base64 = YES;
253 256
    }
@ -310,7 +313,7 @@ BOOL base64;
310 313
- (void)getQrCodePhoto:(NSArray *)param type:(UIImagePickerControllerSourceType)sourceType {
311 314
    @try {
312 315
        NSDictionary *dict = [IPUJSONHelper toDictionary:param[0]];
313
        base64 = [dict[@"base64"] boolValue];
316
        base64 = ![dict[@"base64"] boolValue];
314 317
        maxLength = [dict[@"length"] floatValue];
315 318
        minWidth = [dict[@"width"] floatValue];
316 319
        self.detectQrcode = YES;
@ -389,7 +392,7 @@ BOOL base64;
389 392
        }
390 393
        
391 394
        [strongSelf callback:result];
392
        
395
        [strongSelf resetParams];
393 396
        [picker dismissViewControllerAnimated:YES completion:nil];
394 397
    }];
395 398
    imagePicker.modalPresentationStyle = UIModalPresentationFullScreen;
@ -417,4 +420,11 @@ BOOL base64;
417 420
    }
418 421
}
419 422
423
- (void)resetParams {
424
    base64 = NO;
425
    self.detectQrcode = NO;
426
    CGFloat maxLength = 0.0;
427
    CGFloat minWidth = 0.0;
428
}
429
420 430
@end

+ 1 - 1
display-center/ReactNative/node_modules/react-native-camera/ios/RNCamera.xcodeproj/xcuserdata/benny.xcuserdatad/xcschemes/xcschememanagement.plist

@ -7,7 +7,7 @@
7 7
		<key>RNCamera.xcscheme_^#shared#^_</key>
8 8
		<dict>
9 9
			<key>orderHint</key>
10
			<integer>31</integer>
10
			<integer>33</integer>
11 11
		</dict>
12 12
	</dict>
13 13
</dict>

+ 1 - 1
display-center/ReactNative/node_modules/react-native-gesture-handler/ios/RNGestureHandler.xcodeproj/xcuserdata/benny.xcuserdatad/xcschemes/xcschememanagement.plist

@ -7,7 +7,7 @@
7 7
		<key>RNGestureHandler.xcscheme_^#shared#^_</key>
8 8
		<dict>
9 9
			<key>orderHint</key>
10
			<integer>29</integer>
10
			<integer>31</integer>
11 11
		</dict>
12 12
	</dict>
13 13
</dict>

+ 1 - 1
display-center/ReactNative/node_modules/react-native-vector-icons/RNVectorIcons.xcodeproj/xcuserdata/benny.xcuserdatad/xcschemes/xcschememanagement.plist

@ -14,7 +14,7 @@
14 14
		<key>RNVectorIcons.xcscheme_^#shared#^_</key>
15 15
		<dict>
16 16
			<key>orderHint</key>
17
			<integer>30</integer>
17
			<integer>32</integer>
18 18
		</dict>
19 19
	</dict>
20 20
	<key>SuppressBuildableAutocreation</key>

+ 1 - 1
display-center/ReactNative/node_modules/react-native-webview/ios/RNCWebView.xcodeproj/xcuserdata/benny.xcuserdatad/xcschemes/xcschememanagement.plist

@ -7,7 +7,7 @@
7 7
		<key>RNCWebView.xcscheme_^#shared#^_</key>
8 8
		<dict>
9 9
			<key>orderHint</key>
10
			<integer>28</integer>
10
			<integer>30</integer>
11 11
		</dict>
12 12
	</dict>
13 13
</dict>

+ 1 - 1
display-center/ReactNative/node_modules/react-native/Libraries/ART/ART.xcodeproj/xcuserdata/benny.xcuserdatad/xcschemes/xcschememanagement.plist

@ -14,7 +14,7 @@
14 14
		<key>ART.xcscheme_^#shared#^_</key>
15 15
		<dict>
16 16
			<key>orderHint</key>
17
			<integer>37</integer>
17
			<integer>38</integer>
18 18
		</dict>
19 19
	</dict>
20 20
	<key>SuppressBuildableAutocreation</key>

+ 1 - 1
display-center/ReactNative/node_modules/react-native/Libraries/CameraRoll/RCTCameraRoll.xcodeproj/xcuserdata/benny.xcuserdatad/xcschemes/xcschememanagement.plist

@ -7,7 +7,7 @@
7 7
		<key>RCTCameraRoll.xcscheme_^#shared#^_</key>
8 8
		<dict>
9 9
			<key>orderHint</key>
10
			<integer>38</integer>
10
			<integer>37</integer>
11 11
		</dict>
12 12
	</dict>
13 13
</dict>

+ 1 - 1
display-center/ReactNative/node_modules/react-native/Libraries/LinkingIOS/RCTLinking.xcodeproj/xcuserdata/benny.xcuserdatad/xcschemes/xcschememanagement.plist

@ -14,7 +14,7 @@
14 14
		<key>RCTLinking.xcscheme_^#shared#^_</key>
15 15
		<dict>
16 16
			<key>orderHint</key>
17
			<integer>40</integer>
17
			<integer>39</integer>
18 18
		</dict>
19 19
	</dict>
20 20
	<key>SuppressBuildableAutocreation</key>

+ 1 - 1
display-center/ReactNative/node_modules/react-native/Libraries/Settings/RCTSettings.xcodeproj/xcuserdata/benny.xcuserdatad/xcschemes/xcschememanagement.plist

@ -14,7 +14,7 @@
14 14
		<key>RCTSettings.xcscheme_^#shared#^_</key>
15 15
		<dict>
16 16
			<key>orderHint</key>
17
			<integer>41</integer>
17
			<integer>40</integer>
18 18
		</dict>
19 19
	</dict>
20 20
	<key>SuppressBuildableAutocreation</key>

+ 1 - 1
display-center/ReactNative/node_modules/react-native/Libraries/Text/RCTText.xcodeproj/xcuserdata/benny.xcuserdatad/xcschemes/xcschememanagement.plist

@ -14,7 +14,7 @@
14 14
		<key>RCTText.xcscheme_^#shared#^_</key>
15 15
		<dict>
16 16
			<key>orderHint</key>
17
			<integer>42</integer>
17
			<integer>41</integer>
18 18
		</dict>
19 19
	</dict>
20 20
	<key>SuppressBuildableAutocreation</key>

+ 2 - 2
display-center/ReactNative/node_modules/react-native/Libraries/WebSocket/RCTWebSocket.xcodeproj/xcuserdata/benny.xcuserdatad/xcschemes/xcschememanagement.plist

@ -14,7 +14,7 @@
14 14
		<key>RCTWebSocket.xcscheme_^#shared#^_</key>
15 15
		<dict>
16 16
			<key>orderHint</key>
17
			<integer>43</integer>
17
			<integer>42</integer>
18 18
		</dict>
19 19
		<key>fishhook-tvOS.xcscheme_^#shared#^_</key>
20 20
		<dict>
@ -26,7 +26,7 @@
26 26
		<key>fishhook.xcscheme_^#shared#^_</key>
27 27
		<dict>
28 28
			<key>orderHint</key>
29
			<integer>39</integer>
29
			<integer>43</integer>
30 30
		</dict>
31 31
	</dict>
32 32
	<key>SuppressBuildableAutocreation</key>

+ 5 - 5
display-center/ReactNative/node_modules/react-native/React/React.xcodeproj/xcuserdata/benny.xcuserdatad/xcschemes/xcschememanagement.plist

@ -26,7 +26,7 @@
26 26
		<key>cxxreact.xcscheme_^#shared#^_</key>
27 27
		<dict>
28 28
			<key>orderHint</key>
29
			<integer>44</integer>
29
			<integer>45</integer>
30 30
		</dict>
31 31
		<key>double-conversion-tvOS.xcscheme_^#shared#^_</key>
32 32
		<dict>
@ -38,7 +38,7 @@
38 38
		<key>double-conversion.xcscheme_^#shared#^_</key>
39 39
		<dict>
40 40
			<key>orderHint</key>
41
			<integer>46</integer>
41
			<integer>48</integer>
42 42
		</dict>
43 43
		<key>jsi-tvOS.xcscheme_^#shared#^_</key>
44 44
		<dict>
@ -74,7 +74,7 @@
74 74
		<key>jsinspector.xcscheme_^#shared#^_</key>
75 75
		<dict>
76 76
			<key>orderHint</key>
77
			<integer>47</integer>
77
			<integer>46</integer>
78 78
		</dict>
79 79
		<key>third-party-tvOS.xcscheme_^#shared#^_</key>
80 80
		<dict>
@ -86,7 +86,7 @@
86 86
		<key>third-party.xcscheme_^#shared#^_</key>
87 87
		<dict>
88 88
			<key>orderHint</key>
89
			<integer>48</integer>
89
			<integer>47</integer>
90 90
		</dict>
91 91
		<key>yoga-tvOS.xcscheme_^#shared#^_</key>
92 92
		<dict>
@ -98,7 +98,7 @@
98 98
		<key>yoga.xcscheme_^#shared#^_</key>
99 99
		<dict>
100 100
			<key>orderHint</key>
101
			<integer>45</integer>
101
			<integer>44</integer>
102 102
		</dict>
103 103
	</dict>
104 104
	<key>SuppressBuildableAutocreation</key>

BIN
display-center/display-center.xcworkspace/xcuserdata/benny.xcuserdatad/UserInterfaceState.xcuserstate