Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
红
红星美凯龙管理在线APP IOS
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
张杰
红星美凯龙管理在线APP IOS
Commits
24cda19e
Commit
24cda19e
authored
9 years ago
by
admin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改bug
parent
810ea6c9
master
develop
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
24 additions
and
11 deletions
+24
-11
UserInterfaceState.xcuserstate
...userdata/admin.xcuserdatad/UserInterfaceState.xcuserstate
+0
-0
InspectSettleViewController.m
...nspectDetail/ViewController/InspectSettleViewController.m
+24
-9
HomeViewController.m
...r/Classes/Module/Home/ViewController/HomeViewController.m
+0
-1
LoginViewController.m
...Classes/Module/Login/ViewController/LoginViewController.m
+0
-1
No files found.
redstar.xcworkspace/xcuserdata/admin.xcuserdatad/UserInterfaceState.xcuserstate
View file @
24cda19e
No preview for this file type
This diff is collapsed.
Click to expand it.
redstar/Classes/Module/Function/WordOfMouth/Inspect/InspectDetail/ViewController/InspectSettleViewController.m
View file @
24cda19e
...
...
@@ -70,17 +70,33 @@
// 移除显示Image的Button
[
button
.
superview
removeFromSuperview
];
CGFloat
btnH
=
110
;
CGFloat
marginY
=
10
;
int
count
=
(
int
)
self
.
footerView
.
takePhotoView
.
allImages
.
count
+
1
;
int
k
;
if
(
count
%
2
==
0
)
{
k
=
count
/
2
;
}
else
{
k
=
(
count
+
1
)
/
2
;
}
self
.
footerView
.
takePhotoView
.
frame
=
CGRectMake
(
0
,
40
,
kScreenWidth
,
k
*
btnH
+
(
k
+
1
)
*
marginY
);
self
.
footerView
.
height
=
self
.
footerView
.
takePhotoView
.
frame
.
size
.
height
+
220
;
}
-
(
void
)
createImagePicker
{
// 创建相册
UIImagePickerController
*
pc
=
[[
UIImagePickerController
alloc
]
init
];
pc
.
allowsEditing
=
YES
;
pc
.
delegate
=
self
;
// 推出
[
self
presentViewController
:
pc
animated
:
YES
completion
:
nil
];
if
(
!
[
UIImagePickerController
isSourceTypeAvailable
:
UIImagePickerControllerSourceTypeCamera
])
{
UIAlertView
*
alert
=
[[
UIAlertView
alloc
]
initWithTitle
:
nil
message
:
@"Unable to find the camera"
delegate
:
nil
cancelButtonTitle
:
nil
otherButtonTitles
:
@"OK"
,
nil
];
[
alert
show
];
}
else
{
UIImagePickerController
*
picker
=
[[
UIImagePickerController
alloc
]
init
];
picker
.
delegate
=
self
;
picker
.
sourceType
=
UIImagePickerControllerSourceTypeCamera
;
picker
.
modalTransitionStyle
=
UIModalTransitionStyleFlipHorizontal
;
picker
.
videoQuality
=
UIImagePickerControllerQualityTypeLow
;
[
self
presentViewController
:
picker
animated
:
YES
completion
:
nil
];
}
}
-
(
void
)
takePhotoShowPicture
:
(
UIButton
*
)
btn
...
...
@@ -93,7 +109,7 @@
#pragma mark - UIImagePickerController 代理方法
-
(
void
)
imagePickerController
:
(
UIImagePickerController
*
)
picker
didFinishPickingMediaWithInfo
:
(
NSDictionary
*
)
info
{
UIImage
*
image
=
[
info
objectForKey
:
UIImagePickerController
Edited
Image
];
UIImage
*
image
=
[
info
objectForKey
:
UIImagePickerController
Original
Image
];
// 创建一个新的控件
UIButton
*
newButton
=
[
self
.
footerView
.
takePhotoView
createButtonWithImage
:
image
];
...
...
@@ -114,7 +130,6 @@
CGFloat
marginY
=
10
;
self
.
footerView
.
takePhotoView
.
frame
=
CGRectMake
(
0
,
40
,
kScreenWidth
,
k
*
btnH
+
(
k
+
1
)
*
marginY
);
self
.
footerView
.
height
=
self
.
footerView
.
takePhotoView
.
frame
.
size
.
height
+
220
;
NSLog
(
@"self.footerView = %f"
,
self
.
footerView
.
frame
.
size
.
height
);
// 退出图片选择控制器
[
picker
dismissViewControllerAnimated
:
YES
completion
:
nil
];
}
...
...
This diff is collapsed.
Click to expand it.
redstar/Classes/Module/Home/ViewController/HomeViewController.m
View file @
24cda19e
...
...
@@ -121,7 +121,6 @@
self
.
tableView
.
tableHeaderView
=
self
.
headView
;
//
[
self
requestRankingList
];
// 巡检列表
...
...
This diff is collapsed.
Click to expand it.
redstar/Classes/Module/Login/ViewController/LoginViewController.m
View file @
24cda19e
...
...
@@ -127,7 +127,6 @@
return
;
}
HttpClient
*
httpClient
=
[[
HttpClient
alloc
]
initWithLogin
];
UIWindow
*
window
=
[[
UIApplication
sharedApplication
].
windows
lastObject
];
[
MBProgressHUD
showHUDAddedTo
:
window
animated
:
YES
];
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment