Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Sign in / Register
Toggle navigation
Z
ZhiJi-Overseas
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
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
lmj
ZhiJi-Overseas
Commits
6dd830b8
Commit
6dd830b8
authored
Jul 23, 2020
by
lmj_521aiau@163.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
no message
parent
4b678bff
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
37 additions
and
37 deletions
+37
-37
ZhiJi.xcscheme
ZhiJi.xcodeproj/xcshareddata/xcschemes/ZhiJi.xcscheme
+2
-2
ZJPhoneLoginViewController.m
ZhiJi/Classes/Login/Controller/ZJPhoneLoginViewController.m
+3
-3
ZJFriendTrackMapViewController.m
...i/Classes/Map/Controller/ZJFriendTrackMapViewController.m
+18
-18
TQNetworkTools.m
ZhiJi/Classes/Tools/Network/TQNetworkTools.m
+8
-8
ResourceHeader.pch
ZhiJi/Classes/Tools/PCH/ResourceHeader.pch
+6
-6
No files found.
ZhiJi.xcodeproj/xcshareddata/xcschemes/ZhiJi.xcscheme
View file @
6dd830b8
...
@@ -39,7 +39,7 @@
...
@@ -39,7 +39,7 @@
ignoresPersistentStateOnLaunch =
"NO"
ignoresPersistentStateOnLaunch =
"NO"
debugDocumentVersioning =
"YES"
debugDocumentVersioning =
"YES"
debugServiceExtension =
"internal"
debugServiceExtension =
"internal"
allowLocationSimulation =
"
NO
"
>
allowLocationSimulation =
"
YES
"
>
<BuildableProductRunnable
<BuildableProductRunnable
runnableDebuggingMode =
"0"
>
runnableDebuggingMode =
"0"
>
<BuildableReference
<BuildableReference
...
@@ -51,7 +51,7 @@
...
@@ -51,7 +51,7 @@
</BuildableReference>
</BuildableReference>
</BuildableProductRunnable>
</BuildableProductRunnable>
<LocationScenarioReference
<LocationScenarioReference
identifier =
"
com.apple.dt.IDEFoundation.CurrentLocationScenarioIdentifier
"
identifier =
"
London, England
"
referenceType =
"1"
>
referenceType =
"1"
>
</LocationScenarioReference>
</LocationScenarioReference>
</LaunchAction>
</LaunchAction>
...
...
ZhiJi/Classes/Login/Controller/ZJPhoneLoginViewController.m
View file @
6dd830b8
...
@@ -301,7 +301,7 @@
...
@@ -301,7 +301,7 @@
NSString
*
phone
=
phoneTextfield
.
text
;
NSString
*
phone
=
phoneTextfield
.
text
;
NSString
*
phoneCode
=
currentCountryCode
;
NSString
*
phoneCode
=
currentCountryCode
;
//
phone = [NSString stringWithFormat:@"%@%@", phoneCode, phone];
phone
=
[
NSString
stringWithFormat
:
@"%@%@"
,
phoneCode
,
phone
];
[[
TQNetworkTools
shared
]
postWithAction
:
loginWithPhone
parameters
:@{
@"phoneNo"
:
phone
,
@"code"
:
codeTextfield
.
text
}
success
:^
(
id
_Nonnull
response
)
{
[[
TQNetworkTools
shared
]
postWithAction
:
loginWithPhone
parameters
:@{
@"phoneNo"
:
phone
,
@"code"
:
codeTextfield
.
text
}
success
:^
(
id
_Nonnull
response
)
{
...
@@ -351,12 +351,12 @@
...
@@ -351,12 +351,12 @@
NSString
*
phone
=
phoneTextfield
.
text
;
NSString
*
phone
=
phoneTextfield
.
text
;
NSString
*
phoneCode
=
currentCountryCode
;
NSString
*
phoneCode
=
currentCountryCode
;
[[
TQNetworkTools
shared
]
postWithAction
:
getSmsCode
parameters
:@{
@"phoneNo"
:
phone
,
/*@"phoneCode":phoneCode*/
}
success
:^
(
id
_Nonnull
response
)
{
[[
TQNetworkTools
shared
]
postWithAction
:
getSmsCode
parameters
:@{
@"phoneNo"
:
phone
,
@"phoneCode"
:
phoneCode
}
success
:^
(
id
_Nonnull
response
)
{
// self->isSend = YES;
// self->isSend = YES;
NSLog
(
@"getSmsCode response %@"
,
response
);
NSLog
(
@"getSmsCode response %@"
,
response
);
if
([[
response
objectForKey
:
@"status"
]
integerValue
]
==
200
){
if
([[
response
objectForKey
:
@"status"
]
integerValue
]
==
200
){
[
self
countDown
:
sender
];
[
self
countDown
:
sender
];
}
else
if
([[
response
objectForKey
:
@"status"
]
integerValue
]
==
105
)
{
}
else
{
[
MBProgressHUD
showError
:[
response
objectForKey
:
@"msg"
]
toView
:
self
.
view
];
[
MBProgressHUD
showError
:[
response
objectForKey
:
@"msg"
]
toView
:
self
.
view
];
}
}
}
failure
:^
(
NSError
*
_Nonnull
error
)
{
}
failure
:^
(
NSError
*
_Nonnull
error
)
{
...
...
ZhiJi/Classes/Map/Controller/ZJFriendTrackMapViewController.m
View file @
6dd830b8
...
@@ -337,24 +337,24 @@
...
@@ -337,24 +337,24 @@
dispatch_source_set_timer
(
timer
,
DISPATCH_TIME_NOW
,
0
.
3
*
NSEC_PER_SEC
,
0
*
NSEC_PER_SEC
);
dispatch_source_set_timer
(
timer
,
DISPATCH_TIME_NOW
,
0
.
3
*
NSEC_PER_SEC
,
0
*
NSEC_PER_SEC
);
dispatch_source_set_event_handler
(
timer
,
^
{
dispatch_source_set_event_handler
(
timer
,
^
{
if
(
self
.
count
<
self
.
initiallinepath
.
count
)
{
//
if (self.count < self.initiallinepath.count) {
//
CLLocationCoordinate2D
coordinate
=
[
self
.
initiallinepath
coordinateAtIndex
:
self
.
count
];
//
CLLocationCoordinate2D coordinate = [self.initiallinepath coordinateAtIndex:self.count];
[
self
.
actionlinepath
addCoordinate
:
coordinate
];
//
[self.actionlinepath addCoordinate:coordinate];
//
self
.
actionPolyline
=
[
GMSPolyline
polylineWithPath
:
self
.
actionlinepath
];
//
self.actionPolyline = [GMSPolyline polylineWithPath:self.actionlinepath];
self
.
actionPolyline
.
strokeColor
=
[
UIColor
greenColor
];
//
self.actionPolyline.strokeColor = [UIColor greenColor];
self
.
actionPolyline
.
strokeWidth
=
2
;
//
self.actionPolyline.strokeWidth = 2;
[
CATransaction
begin
];
//
[CATransaction begin];
[
CATransaction
setAnimationDuration
:
0
.
3
];
//
[CATransaction setAnimationDuration:0.3];
self
.
actionMarker
.
position
=
coordinate
;
//
self.actionMarker.position = coordinate;
// self.actionMarker.rotation = location.course
//
//
self.actionMarker.rotation = location.course
self
.
actionPolyline
.
map
=
self
.
mapView
;
//
self.actionPolyline.map = self.mapView;
[
CATransaction
commit
];
//
[CATransaction commit];
self
.
count
++
;
//
self.count++;
}
else
{
//
}else{
dispatch_source_cancel
(
timer
);
//
dispatch_source_cancel(timer);
}
//
}
});
});
dispatch_resume
(
timer
);
dispatch_resume
(
timer
);
...
...
ZhiJi/Classes/Tools/Network/TQNetworkTools.m
View file @
6dd830b8
...
@@ -213,8 +213,8 @@ static TQNetworkTools* _tools = nil;
...
@@ -213,8 +213,8 @@ static TQNetworkTools* _tools = nil;
// [dict setValue: @"1" forKey: @"tgtk"];
// [dict setValue: @"1" forKey: @"tgtk"];
// 获取BundleID
// 获取BundleID
//
[dict setValue: [[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleIdentifier"] forKey: @"pkg"];
[
dict
setValue
:
[[[
NSBundle
mainBundle
]
infoDictionary
]
objectForKey
:
@"CFBundleIdentifier"
]
forKey
:
@"pkg"
];
[
dict
setValue
:
@"com.app.zhiji"
forKey
:
@"pkg"
];
//cs
//
[dict setValue: @"com.app.zhiji" forKey: @"pkg"]; //cs
NSString
*
identifierForVendor
=
[[
data
Read
]
objectForKey
:
@"Identifier"
];;
NSString
*
identifierForVendor
=
[[
data
Read
]
objectForKey
:
@"Identifier"
];;
[
dict
setValue
:
identifierForVendor
forKey
:
@"device"
];
[
dict
setValue
:
identifierForVendor
forKey
:
@"device"
];
...
@@ -230,8 +230,8 @@ static TQNetworkTools* _tools = nil;
...
@@ -230,8 +230,8 @@ static TQNetworkTools* _tools = nil;
// }
// }
//appLs
//appLs
//
[dict setValue: @"040087e60c36fd63" forKey: @"appLs"];
[
dict
setValue
:
@"040087e60c36fd63"
forKey
:
@"appLs"
];
[
dict
setValue
:
@"d904ceaa1b3f6444"
forKey
:
@"appLs"
];
//cs
//
[dict setValue: @"d904ceaa1b3f6444" forKey: @"appLs"]; //cs
// 设置网络类型
// 设置网络类型
[[
AFNetworkReachabilityManager
sharedManager
]
setReachabilityStatusChangeBlock
:
^
(
AFNetworkReachabilityStatus
status
)
{
[[
AFNetworkReachabilityManager
sharedManager
]
setReachabilityStatusChangeBlock
:
^
(
AFNetworkReachabilityStatus
status
)
{
...
@@ -556,8 +556,8 @@ static TQNetworkTools* _tools = nil;
...
@@ -556,8 +556,8 @@ static TQNetworkTools* _tools = nil;
[
dict
setValue
:
identifierForVendor
forKey
:
@"device"
];
[
dict
setValue
:
identifierForVendor
forKey
:
@"device"
];
NSLog
(
@"identifierForVendor info == %@"
,
identifierForVendor
);
NSLog
(
@"identifierForVendor info == %@"
,
identifierForVendor
);
// 获取BundleID
// 获取BundleID
//
[dict setValue: [[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleIdentifier"] forKey: @"pkg"];
[
dict
setValue
:
[[[
NSBundle
mainBundle
]
infoDictionary
]
objectForKey
:
@"CFBundleIdentifier"
]
forKey
:
@"pkg"
];
[
dict
setValue
:
@"com.app.zhiji"
forKey
:
@"pkg"
];
//
[dict setValue: @"com.app.zhiji" forKey: @"pkg"];
// 设置时间戳
// 设置时间戳
NSTimeInterval
today
=
[[
NSDate
date
]
timeIntervalSince1970
]
*
1000
;
NSTimeInterval
today
=
[[
NSDate
date
]
timeIntervalSince1970
]
*
1000
;
...
@@ -569,8 +569,8 @@ static TQNetworkTools* _tools = nil;
...
@@ -569,8 +569,8 @@ static TQNetworkTools* _tools = nil;
// }
// }
//appLs
//appLs
//
[dict setValue: @"040087e60c36fd63" forKey: @"appLs"];
[
dict
setValue
:
@"040087e60c36fd63"
forKey
:
@"appLs"
];
[
dict
setValue
:
@"d904ceaa1b3f6444"
forKey
:
@"appLs"
];
//
[dict setValue: @"d904ceaa1b3f6444" forKey: @"appLs"];
[
dict
addEntriesFromDictionary
:[
self
signParams
:
dict
]];
[
dict
addEntriesFromDictionary
:[
self
signParams
:
dict
]];
...
...
ZhiJi/Classes/Tools/PCH/ResourceHeader.pch
View file @
6dd830b8
...
@@ -26,15 +26,15 @@
...
@@ -26,15 +26,15 @@
//#define ServerHost @"https://feedapitest.zhangxinhulian.com"
//#define ServerHost @"https://feedapitest.zhangxinhulian.com"
//#define ServerHostFeed @"https://feedapitest.zhangxinhulian.com"
//#define ServerHostFeed @"https://feedapitest.zhangxinhulian.com"
#define ServerReport @"http://report.zhangxinhulian.com"
//
#define ServerReport @"http://report.zhangxinhulian.com"
#define ServerHost @"https://feedapi.zhangxinhulian.com"
//
#define ServerHost @"https://feedapi.zhangxinhulian.com"
#define ServerHostFeed @"https://feedapi.zhangxinhulian.com"
//
#define ServerHostFeed @"https://feedapi.zhangxinhulian.com"
//
//
//#else
//#else
//
#define ServerReport @"http://report.linking100.com"
#define ServerReport @"http://report.linking100.com"
//
#define ServerHost @"https://feedapi.linking100.com"
#define ServerHost @"https://feedapi.linking100.com"
//
#define ServerHostFeed @"https://feedapi.linking100.com"
#define ServerHostFeed @"https://feedapi.linking100.com"
//#endif
//#endif
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