Skip to content

X
xffruit
Commit 8fe71f9e authored by 管鹏飞's avatar 管鹏飞
Browse files
Options

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

parent 650cf2c8
Show whitespace changes
Inline Side-by-side
Showing with 34 additions and 31 deletions
Podfile
View file @ 8fe71f9e
platform :ios, '7.1'
pod 'AFNetworking', '~> 2.5.4'
pod 'SDWebImage', '~> 3.7.2'
......
XFFruit.xcodeproj/project.pbxproj
View file @ 8fe71f9e
......@@ -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
View file @ 8fe71f9e
......@@ -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
View file @ 8fe71f9e
......@@ -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
View file @ 8fe71f9e
......@@ -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
View file @ 8fe71f9e
......@@ -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
View file @ 8fe71f9e
......@@ -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;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment