1.修改RA Image类PhotoPreviewCell -> RAImagePhotoPreviewCell。

2.修改RA Image Network参数增加_action参数。

RA Image/RA Image.xcodeproj/project.pbxproj

@@ -14,7 +14,7 @@
 		426E6B271EB85C4200942BE1 /* ModelModeViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 426E6B261EB85C4200942BE1 /* ModelModeViewController.m */; };
 		426E6B291EB8720400942BE1 /* Mode.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 426E6B281EB8720400942BE1 /* Mode.storyboard */; };
 		428566D51EF1220F0041208A /* NewPhotoPreviewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 428566D41EF1220F0041208A /* NewPhotoPreviewController.m */; };
-		428566D81EF122360041208A /* PhotoPreviewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 428566D71EF122360041208A /* PhotoPreviewCell.m */; };
+		428566D81EF122360041208A /* RAImagePhotoPreviewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 428566D71EF122360041208A /* RAImagePhotoPreviewCell.m */; };
 		429F25221EC9AA4200C22ABB /* TakePhotoPreviewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 429F25211EC9AA4200C22ABB /* TakePhotoPreviewController.m */; };
 		42A0E02A1F1D98970020BFC6 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 42A0E0291F1D98970020BFC6 /* SystemConfiguration.framework */; };
 		42A829C01EBC027100898B8A /* RootNavigationController.m in Sources */ = {isa = PBXBuildFile; fileRef = 42A829BF1EBC027100898B8A /* RootNavigationController.m */; };
@@ -24,11 +24,12 @@
 		42A829CE1EBC6CA900898B8A /* Upload.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 42A829CD1EBC6CA900898B8A /* Upload.storyboard */; };
 		42A829D21EBC6D3300898B8A /* UploadCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 42A829D11EBC6D3300898B8A /* UploadCell.m */; };
 		42BC2CFF1EBAC4050016B30D /* PhotoListViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 42BC2CFE1EBAC4050016B30D /* PhotoListViewController.m */; };
-		42BC2D011EBAC4310016B30D /* PhotoList.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 42BC2D001EBAC4310016B30D /* PhotoList.storyboard */; };
+		42BC2D011EBAC4310016B30D /* RAImage_PhotoList.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 42BC2D001EBAC4310016B30D /* RAImage_PhotoList.storyboard */; };
 		42BC2D051EBAC4C00016B30D /* PhotoCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 42BC2D041EBAC4C00016B30D /* PhotoCell.m */; };
 		42BC2D091EBAC75F0016B30D /* TouchImageView.m in Sources */ = {isa = PBXBuildFile; fileRef = 42BC2D081EBAC75F0016B30D /* TouchImageView.m */; };
 		42BC2D0C1EBB00FD0016B30D /* PhotoPreviewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 42BC2D0B1EBB00FD0016B30D /* PhotoPreviewController.m */; };
 		42BC6FFA1EC1ACF9004A5F30 /* UploadSettingController.m in Sources */ = {isa = PBXBuildFile; fileRef = 42BC6FF91EC1ACF9004A5F30 /* UploadSettingController.m */; };
+		42D64CC11FD12B21003F49F9 /* RAConvertor.m in Sources */ = {isa = PBXBuildFile; fileRef = 42D64CC01FD12B21003F49F9 /* RAConvertor.m */; };
 		42E1B0FD1EB1C8EE00EEF27C /* LoginSwitchCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 42E1B0FB1EB1C8EE00EEF27C /* LoginSwitchCell.m */; };
 		42E1B0FE1EB1C8EE00EEF27C /* LoginTextFiledCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 42E1B0FC1EB1C8EE00EEF27C /* LoginTextFiledCell.m */; };
 		42E1B1021EB1C92000EEF27C /* BasicViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 42E1B1011EB1C92000EEF27C /* BasicViewController.m */; };
@@ -85,8 +86,8 @@
 		426E6B281EB8720400942BE1 /* Mode.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = Mode.storyboard; sourceTree = "<group>"; };
 		428566D31EF1220F0041208A /* NewPhotoPreviewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NewPhotoPreviewController.h; sourceTree = "<group>"; };
 		428566D41EF1220F0041208A /* NewPhotoPreviewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NewPhotoPreviewController.m; sourceTree = "<group>"; };
-		428566D61EF122360041208A /* PhotoPreviewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PhotoPreviewCell.h; sourceTree = "<group>"; };
-		428566D71EF122360041208A /* PhotoPreviewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PhotoPreviewCell.m; sourceTree = "<group>"; };
+		428566D61EF122360041208A /* RAImagePhotoPreviewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RAImagePhotoPreviewCell.h; sourceTree = "<group>"; };
+		428566D71EF122360041208A /* RAImagePhotoPreviewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RAImagePhotoPreviewCell.m; sourceTree = "<group>"; };
 		429F25201EC9AA4200C22ABB /* TakePhotoPreviewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TakePhotoPreviewController.h; sourceTree = "<group>"; };
 		429F25211EC9AA4200C22ABB /* TakePhotoPreviewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TakePhotoPreviewController.m; sourceTree = "<group>"; };
 		42A0E0291F1D98970020BFC6 /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = System/Library/Frameworks/SystemConfiguration.framework; sourceTree = SDKROOT; };
@@ -104,7 +105,7 @@
 		42A829D11EBC6D3300898B8A /* UploadCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UploadCell.m; sourceTree = "<group>"; };
 		42BC2CFD1EBAC4050016B30D /* PhotoListViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PhotoListViewController.h; sourceTree = "<group>"; };
 		42BC2CFE1EBAC4050016B30D /* PhotoListViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PhotoListViewController.m; sourceTree = "<group>"; };
-		42BC2D001EBAC4310016B30D /* PhotoList.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = PhotoList.storyboard; sourceTree = "<group>"; };
+		42BC2D001EBAC4310016B30D /* RAImage_PhotoList.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = RAImage_PhotoList.storyboard; sourceTree = "<group>"; };
 		42BC2D031EBAC4C00016B30D /* PhotoCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PhotoCell.h; sourceTree = "<group>"; };
 		42BC2D041EBAC4C00016B30D /* PhotoCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PhotoCell.m; sourceTree = "<group>"; };
 		42BC2D071EBAC75F0016B30D /* TouchImageView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TouchImageView.h; sourceTree = "<group>"; };
@@ -113,6 +114,8 @@
 		42BC2D0B1EBB00FD0016B30D /* PhotoPreviewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PhotoPreviewController.m; sourceTree = "<group>"; };
 		42BC6FF81EC1ACF9004A5F30 /* UploadSettingController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UploadSettingController.h; sourceTree = "<group>"; };
 		42BC6FF91EC1ACF9004A5F30 /* UploadSettingController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UploadSettingController.m; sourceTree = "<group>"; };
+		42D64CBF1FD12B20003F49F9 /* RAConvertor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RAConvertor.h; path = ../../common/RAConvertor.h; sourceTree = "<group>"; };
+		42D64CC01FD12B21003F49F9 /* RAConvertor.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = RAConvertor.m; path = ../../common/RAConvertor.m; sourceTree = "<group>"; };
 		42E1B0F91EB1C8EE00EEF27C /* LoginSwitchCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LoginSwitchCell.h; sourceTree = "<group>"; };
 		42E1B0FA1EB1C8EE00EEF27C /* LoginTextFiledCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LoginTextFiledCell.h; sourceTree = "<group>"; };
 		42E1B0FB1EB1C8EE00EEF27C /* LoginSwitchCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LoginSwitchCell.m; sourceTree = "<group>"; };
@@ -285,7 +288,7 @@
 		42BC2CFC1EBAC3D40016B30D /* PhotoList */ = {
 			isa = PBXGroup;
 			children = (
-				42BC2D001EBAC4310016B30D /* PhotoList.storyboard */,
+				42BC2D001EBAC4310016B30D /* RAImage_PhotoList.storyboard */,
 				42BC2CFD1EBAC4050016B30D /* PhotoListViewController.h */,
 				42BC2CFE1EBAC4050016B30D /* PhotoListViewController.m */,
 				42BC2D0A1EBB00FD0016B30D /* PhotoPreviewController.h */,
@@ -302,8 +305,8 @@
 			children = (
 				42BC2D031EBAC4C00016B30D /* PhotoCell.h */,
 				42BC2D041EBAC4C00016B30D /* PhotoCell.m */,
-				428566D61EF122360041208A /* PhotoPreviewCell.h */,
-				428566D71EF122360041208A /* PhotoPreviewCell.m */,
+				428566D61EF122360041208A /* RAImagePhotoPreviewCell.h */,
+				428566D71EF122360041208A /* RAImagePhotoPreviewCell.m */,
 			);
 			name = view;
 			sourceTree = "<group>";
@@ -407,6 +410,8 @@
 				71114AA51EB1C50D00D2200C /* RAUtils.m */,
 				71114ACD1EB1C79300D2200C /* Reachability.h */,
 				71114ACE1EB1C79300D2200C /* Reachability.m */,
+				42D64CBF1FD12B20003F49F9 /* RAConvertor.h */,
+				42D64CC01FD12B21003F49F9 /* RAConvertor.m */,
 				717A37AC1ED6BF0700E09FB6 /* ImageUtils.h */,
 				717A37AD1ED6BF0700E09FB6 /* ImageUtils.m */,
 			);
@@ -609,7 +614,7 @@
 				71114AEE1EB2DEF900D2200C /* cam_scan.storyboard in Resources */,
 				71DCDC421EAF234E00BA045A /* RAImage.storyboard in Resources */,
 				71114AB31EB1C5C800D2200C /* LICENSE in Resources */,
-				42BC2D011EBAC4310016B30D /* PhotoList.storyboard in Resources */,
+				42BC2D011EBAC4310016B30D /* RAImage_PhotoList.storyboard in Resources */,
 				42E1B1041EB1CCB200EEF27C /* login.json in Resources */,
 				42A829CE1EBC6CA900898B8A /* Upload.storyboard in Resources */,
 			);
@@ -647,7 +652,7 @@
 				71E9F6B31F8B46380052C78E /* NetworkUtils.m in Sources */,
 				71114AA31EB1C40900D2200C /* RANetwork.m in Sources */,
 				71114AC91EB1C73B00D2200C /* zip.c in Sources */,
-				428566D81EF122360041208A /* PhotoPreviewCell.m in Sources */,
+				428566D81EF122360041208A /* RAImagePhotoPreviewCell.m in Sources */,
 				71114AF31EB2DEF900D2200C /* SCShapeView.m in Sources */,
 				71961CB11EC00DDD002C4096 /* RAUploadManager.m in Sources */,
 				71114AF21EB2DEF900D2200C /* ScannerViewController.m in Sources */,
@@ -659,6 +664,7 @@
 				71749AFD1ECC199300018EEC /* UIImage+fixOrientation.m in Sources */,
 				71DCDC3C1EAF234E00BA045A /* AppDelegate.m in Sources */,
 				71961CB21EC00DDD002C4096 /* RAUploadOperation.m in Sources */,
+				42D64CC11FD12B21003F49F9 /* RAConvertor.m in Sources */,
 				429F25221EC9AA4200C22ABB /* TakePhotoPreviewController.m in Sources */,
 				42E1B1021EB1C92000EEF27C /* BasicViewController.m in Sources */,
 				426E6B1F1EB8558400942BE1 /* RootModeCell.m in Sources */,

RA Image/RA Image/BasicModeViewController.m

@@ -166,7 +166,7 @@
         [self showCamera];
         return;
     }
-    PhotoListViewController *photoListVC = (PhotoListViewController *)[self viewControllerInStoryboard:@"PhotoList" withId:@"PhotoListViewController"];
+    PhotoListViewController *photoListVC = (PhotoListViewController *)[self viewControllerInStoryboard:@"RAImage_PhotoList" withId:@"PhotoListViewController"];
 //    photoListVC.photos = self.photos;
     photoListVC.modeVC = self;
     [self.navigationController pushViewController:photoListVC animated:YES];

RA Image/RA Image/ModelModeViewController.m

@@ -125,6 +125,7 @@
                                      @"mode":self.name,
                                      @"barcode":self.barcode,
                                      @"_operate":@"valid_upload",
+                                     @"_action":@"handset_new",
                                      @"platform":@"ios"
                                      } mutableCopy];
     
@@ -180,6 +181,7 @@
                                          @"mode":self.name,
                                          @"barcode":self.barcode,
                                          @"_operate":@"upload",
+                                         @"_action":@"handset_new",
                                          @"platform":@"ios",
                                          @"md5":md5
                                          } mutableCopy];

RA Image/RA Image/NewPhotoPreviewController.m

@@ -7,7 +7,7 @@
 //
 
 #import "NewPhotoPreviewController.h"
-#import "PhotoPreviewCell.h"
+#import "RAImagePhotoPreviewCell.h"
 
 @interface NewPhotoPreviewController ()<UICollectionViewDelegate,UICollectionViewDataSource,UICollectionViewDelegateFlowLayout>
 
@@ -139,7 +139,7 @@
 #pragma mark - CollectionView Delegate
 
 - (void)collectionView:(UICollectionView *)collectionView willDisplayCell:(UICollectionViewCell *)cell forItemAtIndexPath:(NSIndexPath *)indexPath {
-    PhotoPreviewCell *preCell = (PhotoPreviewCell *)cell;
+    RAImagePhotoPreviewCell *preCell = (RAImagePhotoPreviewCell *)cell;
     
     
     UIScrollView *sc = preCell.scrollView;
@@ -171,7 +171,7 @@
 }
 
 - (void)collectionView:(UICollectionView *)collectionView didEndDisplayingCell:(UICollectionViewCell *)cell forItemAtIndexPath:(NSIndexPath *)indexPath {
-    PhotoPreviewCell *preCell = (PhotoPreviewCell *)cell;
+    RAImagePhotoPreviewCell *preCell = (RAImagePhotoPreviewCell *)cell;
     UIScrollView *sc = preCell.scrollView;
     for (UIView *v in sc.subviews) {
         [v removeFromSuperview];
@@ -190,7 +190,7 @@
 
 - (UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath {
     
-    PhotoPreviewCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:@"PhotoPreviewCell" forIndexPath:indexPath];
+    RAImagePhotoPreviewCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:@"PhotoPreviewCell" forIndexPath:indexPath];
     
     return cell;
 }

RA Image/RA Image/PhotoListViewController.m

@@ -135,8 +135,8 @@
 
 - (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath {
     // 点击Cell不响应需要在viewDidLoad方法中removeFirstResponderTap
-//    PhotoPreviewController *previewVC = (PhotoPreviewController *)[self viewControllerInStoryboard:@"PhotoList" withId:@"PhotoPreviewController"];
-    NewPhotoPreviewController *previewVC = (NewPhotoPreviewController *)[self viewControllerInStoryboard:@"PhotoList" withId:@"NewPhotoPreviewController"];
+//    PhotoPreviewController *previewVC = (PhotoPreviewController *)[self viewControllerInStoryboard:@"RAImage_PhotoList" withId:@"PhotoPreviewController"];
+    NewPhotoPreviewController *previewVC = (NewPhotoPreviewController *)[self viewControllerInStoryboard:@"RAImage_PhotoList" withId:@"NewPhotoPreviewController"];
     previewVC.photos = self.photos;
     previewVC.currentIndex = indexPath.row;
     [self.navigationController pushViewController:previewVC animated:YES];

RA Image/RA Image/PopModeViewController.m

@@ -137,6 +137,7 @@
                                  @"mode":self.name,
                                  @"barcode":self.barcode,
                                  @"_operate":@"upload",
+                                 @"_action":@"handset_new",
                                  @"platform":@"ios",
                                  @"md5":md5
                                  };

RA Image/RA Image/PhotoPreviewCell.h → RA Image/RA Image/RAImagePhotoPreviewCell.h

@@ -8,7 +8,7 @@
 
 #import <UIKit/UIKit.h>
 
-@interface PhotoPreviewCell : UICollectionViewCell
+@interface RAImagePhotoPreviewCell : UICollectionViewCell
 @property (strong, nonatomic) IBOutlet UIScrollView *scrollView;
 
 @end

RA Image/RA Image/PhotoPreviewCell.m → RA Image/RA Image/RAImagePhotoPreviewCell.m

@@ -6,8 +6,8 @@
 //  Copyright © 2017年 USAI. All rights reserved.
 //
 
-#import "PhotoPreviewCell.h"
+#import "RAImagePhotoPreviewCell.h"
 
-@implementation PhotoPreviewCell
+@implementation RAImagePhotoPreviewCell
 
 @end

RA Image/RA Image/PhotoList.storyboard → RA Image/RA Image/RAImage_PhotoList.storyboard

@@ -1,11 +1,11 @@
 <?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" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13529" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
     <device id="retina5_5" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12088"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13527"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
@@ -208,7 +208,7 @@
                                     <inset key="sectionInset" minX="0.0" minY="0.0" maxX="0.0" maxY="0.0"/>
                                 </collectionViewFlowLayout>
                                 <cells>
-                                    <collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" reuseIdentifier="PhotoPreviewCell" id="eAR-El-bRn" customClass="PhotoPreviewCell">
+                                    <collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" reuseIdentifier="PhotoPreviewCell" id="eAR-El-bRn" customClass="RAImagePhotoPreviewCell">
                                         <rect key="frame" x="0.0" y="0.66666666666666663" width="414" height="735"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                         <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center">

RA Image/RA Image/RANetwork.m

@@ -10,6 +10,7 @@
 #import "AppDelegate.h"
 #import "AESCrypt.h"
 #import "RAUtils.h"
+#import "RAConvertor.h"
 
 @implementation RANetwork
 
@@ -92,7 +93,7 @@
         
         NSString* base64str = jsobj[@"str"];
         NSString* decryptstr=[AESCrypt AES128Decrypt:base64str key:@"usai2010"];
-        jsobj=[[RAUtils string2dict:decryptstr] mutableCopy];
+        jsobj=[[RAConvertor string2dict:decryptstr] mutableCopy];
         return jsobj;
     }];
     
@@ -113,6 +114,7 @@
     
     NSMutableDictionary *params = @{@"user":encryptu,
                                     @"password":encryptp,
+                                    @"_action":@"handset_new",
                                     @"_operate":@"handset_login"
                                     }.mutableCopy;
     AppDelegate *appDelegate = (AppDelegate *)[UIApplication sharedApplication].delegate;
@@ -158,6 +160,7 @@
                                     @"user":encryptu,
                                     @"password":encryptp,
                                     @"_operate":@"handset_get_manufacturer",
+                                    @"_action":@"handset_new",
                                     @"barcode":model
                                     }.mutableCopy;