Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
X
xffruit
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
张杰
xffruit
Commits
94d2e539
Commit
94d2e539
authored
Jul 28, 2017
by
Sandy
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
增加开发版target,修复bug
parent
c86c82fa
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
946 additions
and
5 deletions
+946
-5
project.pbxproj
XFFruit.xcodeproj/project.pbxproj
+864
-1
ICRLoginContentView.m
XFFruit/General/Views/ICRLoginContentView.m
+4
-0
Info.plist
XFFruit/Info.plist
+0
-0
ICRAppMacro.h
XFFruit/Macro/ICRAppMacro.h
+5
-3
ReceiveProductViewController.m
...lers/Receiving/Controllers/ReceiveProductViewController.m
+1
-1
XFFruit_TEST.plist
XFFruit_TEST.plist
+72
-0
No files found.
XFFruit.xcodeproj/project.pbxproj
View file @
94d2e539
This diff is collapsed.
Click to expand it.
XFFruit/General/Views/ICRLoginContentView.m
View file @
94d2e539
...
@@ -332,9 +332,13 @@
...
@@ -332,9 +332,13 @@
#pragma mark - Public Method
#pragma mark - Public Method
-
(
void
)
checkLoginEnable
{
-
(
void
)
checkLoginEnable
{
_m_cCodeTextF
.
text
=
[
_m_cCodeTextF
.
text
stringByReplacingOccurrencesOfString
:
@" "
withString
:
@""
];
_m_userNameTextF
.
text
=
[
_m_userNameTextF
.
text
stringByReplacingOccurrencesOfString
:
@" "
withString
:
@""
];
self
.
m_loginBtn
.
enabled
=
m_bShowCode
?
self
.
m_loginBtn
.
enabled
=
m_bShowCode
?
((
_m_cCodeTextF
.
text
.
length
>
0
)
&&
(
_m_userNameTextF
.
text
.
length
>
0
)
&&
(
_m_passwordTextF
.
text
.
length
>
0
))
:
((
_m_cCodeTextF
.
text
.
length
>
0
)
&&
(
_m_userNameTextF
.
text
.
length
>
0
)
&&
(
_m_passwordTextF
.
text
.
length
>
0
))
:
((
_m_userNameTextF
.
text
.
length
>
0
)
&&
(
_m_passwordTextF
.
text
.
length
>
0
));
((
_m_userNameTextF
.
text
.
length
>
0
)
&&
(
_m_passwordTextF
.
text
.
length
>
0
));
}
}
-
(
BOOL
)
isAutoLogin
{
-
(
BOOL
)
isAutoLogin
{
...
...
XFFruit/Info.plist
View file @
94d2e539
No preview for this file type
XFFruit/Macro/ICRAppMacro.h
View file @
94d2e539
...
@@ -34,10 +34,12 @@
...
@@ -34,10 +34,12 @@
#define HTTP_REST_API_BASE_URL @"http://gomoredev:8090/cruiser-server/rest"
#define HTTP_REST_API_BASE_URL @"http://gomoredev:8090/cruiser-server/rest"
#define HTTP_REST_REPORT_BASE_URL @"http://gomoredev:8090"
#define HTTP_REST_REPORT_BASE_URL @"http://gomoredev:8090"
#else
#elif XFFruit_TEST
//********测试环境********
//********测试环境********
//#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"
#define HTTP_REST_REPORT_BASE_URL @"http://122.224.171.126:7280"
#else
//********正式环境*********
//********正式环境*********
#define HTTP_REST_API_BASE_URL @"http://app.xianfengsg.com:7380/cruiser-server/rest"
#define HTTP_REST_API_BASE_URL @"http://app.xianfengsg.com:7380/cruiser-server/rest"
...
...
XFFruit/ViewControllers/Receiving/Controllers/ReceiveProductViewController.m
View file @
94d2e539
...
@@ -94,7 +94,7 @@
...
@@ -94,7 +94,7 @@
TransferPdtDetail
*
pdDetail
=
arrSection
[
row
];
TransferPdtDetail
*
pdDetail
=
arrSection
[
row
];
NSInteger
index
=
[
self
.
productArr
indexOfObject
:
pdDetail
];
NSInteger
index
=
[
self
.
productArr
indexOfObject
:
pdDetail
];
[[
NSNotificationCenter
defaultCenter
]
postNotificationName
:
KNOTIFICATION_EditReceiveProduct
object
:
nil
userInfo
:
@{
@"transferPdtDetail"
:
pdDetail
,
@"index
Tag
"
:
@
(
index
)}];
[[
NSNotificationCenter
defaultCenter
]
postNotificationName
:
KNOTIFICATION_EditReceiveProduct
object
:
nil
userInfo
:
@{
@"transferPdtDetail"
:
pdDetail
,
@"index
Path
"
:
@
(
index
)}];
}
}
#pragma mark - 协议方法
#pragma mark - 协议方法
-
(
NSInteger
)
numberOfSectionsInTableView
:
(
UITableView
*
)
tableView
{
-
(
NSInteger
)
numberOfSectionsInTableView
:
(
UITableView
*
)
tableView
{
...
...
XFFruit_TEST.plist
0 → 100644
View file @
94d2e539
<
?xml
v
e
rsion="
1
.
0
"
e
n
c
o
d
ing="UT
F
-
8
"?
>
<
!
D
O
C
TYP
E
plist
PU
B
LI
C
"-//
A
ppl
e
//
D
T
D
PLIST
1
.
0
//
E
N"
"http://www.
a
ppl
e
.
c
om/
D
T
D
s/Prop
e
rtyList-
1
.
0
.
d
t
d
"
>
<
plist
v
e
rsion="
1
.
0
"
>
<
d
i
c
t
>
<
k
e
y
>
CFBundleDevelopmentRegion
<
/k
e
y
>
<
string
>
en
<
/string
>
<
k
e
y
>
CFBundleExecutable
<
/k
e
y
>
<
string
>
$
(
EXECUTABLE_NAME
)<
/string
>
<
k
e
y
>
CFBundleIdentifier
<
/k
e
y
>
<
string
>
$
(
PRODUCT_BUNDLE_IDENTIFIER
)<
/string
>
<
k
e
y
>
CFBundleInfoDictionaryVersion
<
/k
e
y
>
<
string
>
6.0
<
/string
>
<
k
e
y
>
CFBundleName
<
/k
e
y
>
<
string
>
鲜丰平台
<
/string
>
<
k
e
y
>
CFBundlePackageType
<
/k
e
y
>
<
string
>
APPL
<
/string
>
<
k
e
y
>
CFBundleShortVersionString
<
/k
e
y
>
<
string
>
1.6.42
<
/string
>
<
k
e
y
>
CFBundleSignature
<
/k
e
y
>
<
string
>
????
<
/string
>
<
k
e
y
>
CFBundleVersion
<
/k
e
y
>
<
string
>
1.6.42
<
/string
>
<
k
e
y
>
NSAppTransportSecurity
<
/k
e
y
>
<
d
i
c
t
>
<
k
e
y
>
NSAllowsArbitraryLoads
<
/k
e
y
>
<
tru
e
/
>
<
/
d
i
c
t
>
<
k
e
y
>
NSAppleMusicUsageDescription
<
/k
e
y
>
<
string
>
App
需要您的同意,才能访问媒体资料库
<
/string
>
<
k
e
y
>
NSBluetoothPeripheralUsageDescription
<
/k
e
y
>
<
string
>
App
需要您的同意,才能访问蓝牙
<
/string
>
<
k
e
y
>
NSCalendarsUsageDescription
<
/k
e
y
>
<
string
>
App
需要您的同意,才能访问日历
<
/string
>
<
k
e
y
>
NSCameraUsageDescription
<
/k
e
y
>
<
string
>
App
需要您的同意,才能访问相机
<
/string
>
<
k
e
y
>
NSHealthShareUsageDescription
<
/k
e
y
>
<
string
>
App
需要您的同意,才能访问健康分享
<
/string
>
<
k
e
y
>
NSHealthUpdateUsageDescription
<
/k
e
y
>
<
string
>
App
需要您的同意,才能访问健康更新
<
/string
>
<
k
e
y
>
NSLocationAlwaysUsageDescription
<
/k
e
y
>
<
string
>
App
需要您的同意,才能始终访问位置
<
/string
>
<
k
e
y
>
NSLocationUsageDescription
<
/k
e
y
>
<
string
>
App
需要您的同意,才能访问位置
<
/string
>
<
k
e
y
>
NSLocationWhenInUseUsageDescription
<
/k
e
y
>
<
string
>
App
需要您的同意,才能在使用期间访问位置
<
/string
>
<
k
e
y
>
NSMicrophoneUsageDescription
<
/k
e
y
>
<
string
>
App
需要您的同意,才能访问麦克风
<
/string
>
<
k
e
y
>
NSMotionUsageDescription
<
/k
e
y
>
<
string
>
App
需要您的同意,才能访问运动与健身
<
/string
>
<
k
e
y
>
NSPhotoLibraryUsageDescription
<
/k
e
y
>
<
string
>
App
需要您的同意,才能访问相册
<
/string
>
<
k
e
y
>
NSRemindersUsageDescription
<
/k
e
y
>
<
string
>
App
需要您的同意,才能访问提醒事项
<
/string
>
<
k
e
y
>
UILaunchStoryboardName
<
/k
e
y
>
<
string
>
LaunchScreen
<
/string
>
<
k
e
y
>
UIRequiredDeviceCapabilities
<
/k
e
y
>
<
a
rr
a
y
>
<
string
>
armv7
<
/string
>
<
/
a
rr
a
y
>
<
k
e
y
>
UISupportedInterfaceOrientations
<
/k
e
y
>
<
a
rr
a
y
>
<
string
>
UIInterfaceOrientationPortrait
<
/string
>
<
/
a
rr
a
y
>
<
k
e
y
>
UISupportedInterfaceOrientations
~
ipad
<
/k
e
y
>
<
a
rr
a
y
>
<
string
>
UIInterfaceOrientationPortrait
<
/string
>
<
string
>
UIInterfaceOrientationPortraitUpsideDown
<
/string
>
<
string
>
UIInterfaceOrientationLandscapeLeft
<
/string
>
<
string
>
UIInterfaceOrientationLandscapeRight
<
/string
>
<
/
a
rr
a
y
>
<
/
d
i
c
t
>
<
/plist
>
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