Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
P
Palmwms
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
张杰
Palmwms
Commits
a494486d
Commit
a494486d
authored
8 years ago
by
曹云霄
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
debug
parent
d4365b60
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
132 additions
and
18 deletions
+132
-18
project.pbxproj
Palmwms/Palmwms.xcodeproj/project.pbxproj
+9
-4
AppDelegate.m
Palmwms/Palmwms/AppDelegate.m
+1
-1
LoginViewController.m
Palmwms/Palmwms/Class/Login/LoginViewController.m
+1
-1
SearchViewController.m
Palmwms/Palmwms/Class/Main/SearchViewController.m
+3
-1
Info.plist
Palmwms/Palmwms/Info.plist
+11
-11
autobuild.py
Palmwms/autobuild.py
+107
-0
No files found.
Palmwms/Palmwms.xcodeproj/project.pbxproj
View file @
a494486d
...
...
@@ -337,6 +337,7 @@
TargetAttributes
=
{
29CF91721D66B8CC00AE13A8
=
{
CreatedOnToolsVersion
=
7.2
;
DevelopmentTeam
=
39XYE6VSP8
;
};
};
};
...
...
@@ -547,7 +548,8 @@
baseConfigurationReference
=
2A3092547F488EFD2FBE5F24
/* Pods.debug.xcconfig */
;
buildSettings
=
{
ASSETCATALOG_COMPILER_APPICON_NAME
=
AppIcon
;
CODE_SIGN_IDENTITY
=
"iPhone Developer"
;
CODE_SIGN_IDENTITY
=
"iPhone Developer: 云霄 曹 (WM8ZU7YY98)"
;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]"
=
"iPhone Developer: 云霄 曹 (WM8ZU7YY98)"
;
ENABLE_BITCODE
=
NO
;
GCC_PREFIX_HEADER
=
"$(SRCROOT)/Palmwms/Tools/Macro/PrefixHeader.pch"
;
HEADER_SEARCH_PATHS
=
(
...
...
@@ -564,8 +566,9 @@
INFOPLIST_FILE
=
Palmwms/Info.plist
;
IPHONEOS_DEPLOYMENT_TARGET
=
7.0
;
LD_RUNPATH_SEARCH_PATHS
=
"$(inherited) @executable_path/Frameworks"
;
PRODUCT_BUNDLE_IDENTIFIER
=
com.gomore.palm
wms
;
PRODUCT_BUNDLE_IDENTIFIER
=
com.gomore.palm
mall
;
PRODUCT_NAME
=
"$(TARGET_NAME)"
;
PROVISIONING_PROFILE
=
"df541a2c-b94a-4874-904a-04e7843bc5ab"
;
USER_HEADER_SEARCH_PATHS
=
"$(PODS_ROOT)/**"
;
};
name
=
Debug
;
...
...
@@ -575,7 +578,8 @@
baseConfigurationReference
=
B94AB6672F835AEC7D22B9F4
/* Pods.release.xcconfig */
;
buildSettings
=
{
ASSETCATALOG_COMPILER_APPICON_NAME
=
AppIcon
;
CODE_SIGN_IDENTITY
=
"iPhone Developer"
;
CODE_SIGN_IDENTITY
=
"iPhone Developer: 云霄 曹 (WM8ZU7YY98)"
;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]"
=
"iPhone Developer: 云霄 曹 (WM8ZU7YY98)"
;
ENABLE_BITCODE
=
NO
;
GCC_PREFIX_HEADER
=
"$(SRCROOT)/Palmwms/Tools/Macro/PrefixHeader.pch"
;
HEADER_SEARCH_PATHS
=
(
...
...
@@ -592,8 +596,9 @@
INFOPLIST_FILE
=
Palmwms/Info.plist
;
IPHONEOS_DEPLOYMENT_TARGET
=
7.0
;
LD_RUNPATH_SEARCH_PATHS
=
"$(inherited) @executable_path/Frameworks"
;
PRODUCT_BUNDLE_IDENTIFIER
=
com.gomore.palm
wms
;
PRODUCT_BUNDLE_IDENTIFIER
=
com.gomore.palm
mall
;
PRODUCT_NAME
=
"$(TARGET_NAME)"
;
PROVISIONING_PROFILE
=
"df541a2c-b94a-4874-904a-04e7843bc5ab"
;
USER_HEADER_SEARCH_PATHS
=
"$(PODS_ROOT)/**"
;
};
name
=
Release
;
...
...
This diff is collapsed.
Click to expand it.
Palmwms/Palmwms/AppDelegate.m
View file @
a494486d
...
...
@@ -27,8 +27,8 @@
[
self
detectionNetwork
];
[
self
setIQKeyboardManager
];
[
self
setRootViewController
];
[
self
startBaiduMapManager
];
[
self
setRootViewController
];
return
YES
;
}
...
...
This diff is collapsed.
Click to expand it.
Palmwms/Palmwms/Class/Login/LoginViewController.m
View file @
a494486d
...
...
@@ -19,7 +19,7 @@
//取出账户密码
self
.
userNameTextField
.
text
=
[
SSKeychain
passwordForService
:
SERVICENAME
account
:
SAVEACCOUNT
];
self
.
passWordTextField
.
text
=
[
SSKeychain
passwordForService
:
SERVICENAME
account
:
SAVEPASSWORD
];
[
self
changeColor
:[
UITextField
new
]];
if
([
self
.
userNameTextField
.
text
length
])
{
[
self
changeColor
:
self
.
userNameTextField
];
}
...
...
This diff is collapsed.
Click to expand it.
Palmwms/Palmwms/Class/Main/SearchViewController.m
View file @
a494486d
...
...
@@ -183,7 +183,9 @@
UITableViewCell
*
selectCell
=
[
tableView
cellForRowAtIndexPath
:
self
.
selectIndexPath
];
selectCell
.
accessoryType
=
UITableViewCellAccessoryNone
;
self
.
navigationItem
.
rightBarButtonItem
.
enabled
=
false
;
self
.
selectIndexPath
=
nil
;
return
;
if
(
self
.
selectIndexPath
==
indexPath
)
{
self
.
selectIndexPath
=
nil
;
return
;
}
}
//更新记录,选中点击的cell
self
.
selectIndexPath
=
indexPath
;
...
...
This diff is collapsed.
Click to expand it.
Palmwms/Palmwms/Info.plist
View file @
a494486d
...
...
@@ -2,19 +2,10 @@
<
!
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
>
NSLocationAlwaysUsageDescription
<
/k
e
y
>
<
string
><
/string
>
<
k
e
y
>
CFBundleDisplayName
<
/k
e
y
>
<
string
>
旺盛
<
/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
>
UIStatusBarHidden
<
/k
e
y
>
<
tru
e
/
>
<
k
e
y
>
CFBundleDevelopmentRegion
<
/k
e
y
>
<
string
>
en
<
/string
>
<
k
e
y
>
CFBundleDisplayName
<
/k
e
y
>
<
string
>
旺盛
<
/string
>
<
k
e
y
>
CFBundleExecutable
<
/k
e
y
>
<
string
>
$
(
EXECUTABLE_NAME
)<
/string
>
<
k
e
y
>
CFBundleIdentifier
<
/k
e
y
>
...
...
@@ -33,6 +24,13 @@
<
string
>
1
<
/string
>
<
k
e
y
>
LSRequiresIPhoneOS
<
/k
e
y
>
<
tru
e
/
>
<
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
>
NSLocationAlwaysUsageDescription
<
/k
e
y
>
<
string
><
/string
>
<
k
e
y
>
UILaunchStoryboardName
<
/k
e
y
>
<
string
>
LaunchScreen
<
/string
>
<
k
e
y
>
UIMainStoryboardFile
<
/k
e
y
>
...
...
@@ -41,6 +39,8 @@
<
a
rr
a
y
>
<
string
>
armv7
<
/string
>
<
/
a
rr
a
y
>
<
k
e
y
>
UIStatusBarHidden
<
/k
e
y
>
<
tru
e
/
>
<
k
e
y
>
UISupportedInterfaceOrientations
<
/k
e
y
>
<
a
rr
a
y
>
<
string
>
UIInterfaceOrientationPortrait
<
/string
>
...
...
This diff is collapsed.
Click to expand it.
Palmwms/autobuild.py
0 → 100755
View file @
a494486d
from
optparse
import
OptionParser
import
subprocess
import
requests
#configuration for iOS build setting
CODE_SIGN_IDENTITY
=
"iPhone Distribution: Shanghai Gomore Information Technology Co.,Ltd"
PROVISIONING_PROFILE
=
"df541a2c-b94a-4874-904a-04e7843bc5ab"
CONFIGURATION
=
"Release"
SDK
=
"iphoneos"
# configuration for pgyer
PGYER_UPLOAD_URL
=
"http://www.pgyer.com/apiv1/app/upload"
DOWNLOAD_BASE_URL
=
"http://www.pgyer.com"
USER_KEY
=
"a6283ec42bbaf9efc5b6f01a750299f3"
API_KEY
=
"f9aefb343ecc7959f8e216ed08db1c83"
def
cleanBuildDir
(
buildDir
):
cleanCmd
=
"rm -r
%
s"
%
(
buildDir
)
process
=
subprocess
.
Popen
(
cleanCmd
,
shell
=
True
)
process
.
wait
()
print
"cleaned buildDir:
%
s"
%
(
buildDir
)
def
parserUploadResult
(
jsonResult
):
resultCode
=
jsonResult
[
'code'
]
if
resultCode
==
0
:
downUrl
=
DOWNLOAD_BASE_URL
+
"/"
+
jsonResult
[
'data'
][
'appShortcutUrl'
]
print
"Upload Success"
print
"DownUrl is:"
+
downUrl
else
:
print
"Upload Fail!"
print
"Reason:"
+
jsonResult
[
'message'
]
def
uploadIpaToPgyer
(
ipaPath
):
print
"ipaPath:"
+
ipaPath
files
=
{
'file'
:
open
(
ipaPath
,
'rb'
)}
headers
=
{
'enctype'
:
'multipart/form-data'
}
payload
=
{
'uKey'
:
USER_KEY
,
'_api_key'
:
API_KEY
,
'publishRange'
:
'2'
,
'isPublishToPublic'
:
'2'
,
'password'
:
''
}
print
"uploading...."
r
=
requests
.
post
(
PGYER_UPLOAD_URL
,
data
=
payload
,
files
=
files
,
headers
=
headers
)
if
r
.
status_code
==
requests
.
codes
.
ok
:
result
=
r
.
json
()
parserUploadResult
(
result
)
else
:
print
'HTTPError,Code:'
+
r
.
status_code
def
buildProject
(
project
,
target
,
output
):
buildCmd
=
'xcodebuild -project
%
s -target
%
s -sdk
%
s -configuration
%
s build CODE_SIGN_IDENTITY="
%
s" PROVISIONING_PROFILE="
%
s"'
%
(
project
,
target
,
SDK
,
CONFIGURATION
,
CODE_SIGN_IDENTITY
,
PROVISIONING_PROFILE
)
process
=
subprocess
.
Popen
(
buildCmd
,
shell
=
True
)
process
.
wait
()
signApp
=
"./build/
%
s-iphoneos/
%
s.app"
%
(
CONFIGURATION
,
target
)
signCmd
=
"xcrun -sdk
%
s -v PackageApplication
%
s -o
%
s"
%
(
SDK
,
signApp
,
output
)
process
=
subprocess
.
Popen
(
signCmd
,
shell
=
True
)
(
stdoutdata
,
stderrdata
)
=
process
.
communicate
()
uploadIpaToPgyer
(
output
)
cleanBuildDir
(
"./build"
)
def
buildWorkspace
(
workspace
,
scheme
,
output
):
process
=
subprocess
.
Popen
(
"pwd"
,
stdout
=
subprocess
.
PIPE
)
(
stdoutdata
,
stderrdata
)
=
process
.
communicate
()
buildDir
=
stdoutdata
.
strip
()
+
'/build'
print
"buildDir: "
+
buildDir
buildCmd
=
'xcodebuild -workspace
%
s -scheme
%
s -sdk
%
s -configuration
%
s build CODE_SIGN_IDENTITY="
%
s" PROVISIONING_PROFILE="
%
s" SYMROOT=
%
s'
%
(
workspace
,
scheme
,
SDK
,
CONFIGURATION
,
CODE_SIGN_IDENTITY
,
PROVISIONING_PROFILE
,
buildDir
)
process
=
subprocess
.
Popen
(
buildCmd
,
shell
=
True
)
process
.
wait
()
signApp
=
"./build/
%
s-iphoneos/
%
s.app"
%
(
CONFIGURATION
,
scheme
)
signCmd
=
"xcrun -sdk
%
s -v PackageApplication
%
s -o
%
s"
%
(
SDK
,
signApp
,
output
)
process
=
subprocess
.
Popen
(
signCmd
,
shell
=
True
)
(
stdoutdata
,
stderrdata
)
=
process
.
communicate
()
uploadIpaToPgyer
(
output
)
cleanBuildDir
(
buildDir
)
def
xcbuild
(
options
):
project
=
options
.
project
workspace
=
options
.
workspace
target
=
options
.
target
scheme
=
options
.
scheme
output
=
options
.
output
if
project
is
None
and
workspace
is
None
:
pass
elif
project
is
not
None
:
buildProject
(
project
,
target
,
output
)
elif
workspace
is
not
None
:
buildWorkspace
(
workspace
,
scheme
,
output
)
def
main
():
parser
=
OptionParser
()
parser
.
add_option
(
"-w"
,
"--workspace"
,
help
=
"Build the workspace name.xcworkspace."
,
metavar
=
"name.xcworkspace"
)
parser
.
add_option
(
"-p"
,
"--project"
,
help
=
"Build the project name.xcodeproj."
,
metavar
=
"name.xcodeproj"
)
parser
.
add_option
(
"-s"
,
"--scheme"
,
help
=
"Build the scheme specified by schemename. Required if building a workspace."
,
metavar
=
"schemename"
)
parser
.
add_option
(
"-t"
,
"--target"
,
help
=
"Build the target specified by targetname. Required if building a project."
,
metavar
=
"targetname"
)
parser
.
add_option
(
"-o"
,
"--output"
,
help
=
"specify output filename"
,
metavar
=
"output_filename"
)
(
options
,
args
)
=
parser
.
parse_args
()
print
"options:
%
s, args:
%
s"
%
(
options
,
args
)
xcbuild
(
options
)
if
__name__
==
'__main__'
:
main
()
\ No newline at end of file
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