修正『填写行情反馈』图片预览界面第一张图位置错误 Sandy

Podfile

-
-
 platform :ios, '7.1'
 pod 'AFNetworking', '~> 2.5.4'
 pod 'SDWebImage', '~> 3.7.2'

XFFruit.xcodeproj/project.pbxproj

@@ -3450,8 +3450,8 @@
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-				CODE_SIGN_IDENTITY = "iPhone Developer: Minglong Hu (TR9LJDJBFT)";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer: Minglong Hu (TR9LJDJBFT)";
+				CODE_SIGN_IDENTITY = "iPhone Developer";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: Shanghai Gomore Information Technology Co.,Ltd";
 				COPY_PHASE_STRIP = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
@@ -3471,7 +3471,7 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 7.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
-				PROVISIONING_PROFILE = "a12432a9-50b3-4cef-bae7-dcb35f965ce4";
+				PROVISIONING_PROFILE = "";
 				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				USER_HEADER_SEARCH_PATHS = "${SRCROOT}/**";
@@ -3495,8 +3495,8 @@
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-				CODE_SIGN_IDENTITY = "iPhone Developer: Minglong Hu (TR9LJDJBFT)";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer: Minglong Hu (TR9LJDJBFT)";
+				CODE_SIGN_IDENTITY = "iPhone Developer";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: Shanghai Gomore Information Technology Co.,Ltd";
 				COPY_PHASE_STRIP = NO;
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
@@ -3509,7 +3509,7 @@
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 7.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
-				PROVISIONING_PROFILE = "a12432a9-50b3-4cef-bae7-dcb35f965ce4";
+				PROVISIONING_PROFILE = "";
 				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				USER_HEADER_SEARCH_PATHS = "${SRCROOT}/**";
@@ -3523,7 +3523,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPYING_PRESERVES_HFS_DATA = NO;
 				ENABLE_BITCODE = NO;
 				GCC_PREFIX_HEADER = "XFFruit/XFFruit-Prefix.pch";
@@ -3537,7 +3537,7 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.gomore.xffruit;
 				PRODUCT_NAME = XFFruit;
-				PROVISIONING_PROFILE = "5747a061-d994-4f1f-8eac-4b028fb34d89";
+				PROVISIONING_PROFILE = "";
 				USER_HEADER_SEARCH_PATHS = "${SRCROOT}/**";
 			};
 			name = Debug;
@@ -3547,8 +3547,8 @@
 			baseConfigurationReference = 7DDFB1D460448C3B45118195 /* Pods.release.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				CODE_SIGN_IDENTITY = "iPhone Distribution: Shanghai Gomore Information Technology Co.,Ltd";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: Shanghai Gomore Information Technology Co.,Ltd";
+				CODE_SIGN_IDENTITY = "iPhone Developer";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPYING_PRESERVES_HFS_DATA = NO;
 				ENABLE_BITCODE = NO;
 				GCC_PREFIX_HEADER = "XFFruit/XFFruit-Prefix.pch";
@@ -3562,7 +3562,7 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.gomore.xffruit;
 				PRODUCT_NAME = XFFruit;
-				PROVISIONING_PROFILE = "5747a061-d994-4f1f-8eac-4b028fb34d89";
+				PROVISIONING_PROFILE = "";
 				USER_HEADER_SEARCH_PATHS = "${SRCROOT}/**";
 			};
 			name = Release;

XFFruit/Macro/ICRAppMacro.h

@@ -23,10 +23,10 @@
 #define ICR_IMAGE_BG_COLOR              [UIColor colorWithW:242 a:1]
 
 //********阿里云内部测试环境********
-#define HTTP_REST_API_BASE_URL  @"http://218.244.151.129:7580/cruiser-server/rest"
+//#define HTTP_REST_API_BASE_URL  @"http://218.244.151.129:7580/cruiser-server/rest"
 
 //********现场测试环境********
-//#define HTTP_REST_API_BASE_URL  @"http://122.224.171.126:7280/cruiser-server/rest"
+#define HTTP_REST_API_BASE_URL  @"http://122.224.171.126:7280/cruiser-server/rest"
 
 
 //********现场正式环境*********

XFFruit/ViewControllers/FeedBack/TakePhotos/HGPhotoWall/HGPhWViewController.m

@@ -40,16 +40,16 @@ static HGPhWViewController *_instance = nil;
     return _instance;
 }
 
-// 重写init方法
-- (id)init {
-    self = [super init];
-    if (!self) {
-        return nil;
-    }
-     //self.photoWall = [[HGPhotoWall alloc]init];
-   // [self initHGPhW];
-    return self;
-}
+//// 重写init方法
+//- (id)init {
+//    self = [super init];
+//    if (!self) {
+//        return nil;
+//    }
+//     //self.photoWall = [[HGPhotoWall alloc]init];
+//   // [self initHGPhW];
+//    return self;
+//}
 
 - (void)viewDidLoad {
     [super viewDidLoad];
@@ -83,13 +83,14 @@ static HGPhWViewController *_instance = nil;
     [self.view addSubview:_scrollV];
     
     self.photoWall = [[HGPhotoWall alloc]init];
-    _photoWall.backgroundColor = [UIColor yellowColor];
+    _photoWall.backgroundColor = [UIColor colorWithWhite:1.000 alpha:0.000];
     _photoWall.frame = (CGRect) {
         .origin.x = 0,
         .origin.y = 0,
         .size.width = self.view.width,
         .size.height = self.scrollV.height
     };//self.view.bounds;
+
     _photoWall.delegate = self;
     
 #pragma 初始化原来的图片数据  从数据库中读出

XFFruit/ViewControllers/FeedBack/TakePhotos/HGPhotoWall/HGPhotoWall.m

@@ -277,9 +277,13 @@
         NSDictionary *dictionaryTemp = [self.arrayPositions objectAtIndex:i];
         CGFloat originx = [[dictionaryTemp objectForKey:kImagePositionx] floatValue];
         CGFloat originy = [[dictionaryTemp objectForKey:kImagePositiony] floatValue];
-        
+        //修正第一个图片位置错误
+        if (i == 0) {
+            originy -= 5;
+        }
         HGPhoto *photoTemp = [self.arrayPhotos objectAtIndex:i];
         [photoTemp moveToPosition:CGPointMake(originx, originy)];
+        NSLog(@"x=%f,y=%f",originx, originy);
     }
     
     CGFloat frameHeight = -1;

XFFruit/ViewControllers/FeedBack/WriteFeedbackViewController.m

@@ -271,7 +271,7 @@ typedef NS_ENUM(NSUInteger, feedbackCellInfo){
     switch (buttonIndex) {
         case 0:
             [self openCamera];
-            break;
+            break;  
         case 1:
             [self libraryPhoto];
             break;
@@ -344,8 +344,8 @@ typedef NS_ENUM(NSUInteger, feedbackCellInfo){
 }
 #pragma  mark btn action
 - (void)photosDisplay {
-   // HGPhWViewController *ghphVC = [[HGPhWViewController alloc]init];
-    [self PushViewController:[HGPhWViewController shareInstance] animated:YES];
+    HGPhWViewController *ghphVC = [[HGPhWViewController alloc]init];
+    [self PushViewController:ghphVC animated:YES];
 }
 #pragma mark - ZYQAssetPickerController Delegate
 -(void)assetPickerController:(ZYQAssetPickerController *)picker didFinishPickingAssets:(NSArray *)assets{

XFFruit/ViewControllers/Home/Controllers/ICRHomeViewController.m

@@ -246,7 +246,7 @@ static NSString *collectionCellID = @"collectionCell";
         {
             WriteFeedbackViewController *svc = [[WriteFeedbackViewController alloc] init];
 //            svc.title = [IBTCommon localizableString:@"Survey"];
-            svc.navigationItem.hidesBackButton = YES;
+//            svc.navigationItem.hidesBackButton = YES;
             [self PushViewController:svc animated:YES];
         }
             break;