Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
G
GeliBusinessPlatform
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
CI / CD Analytics
Repository Analytics
Value Stream Analytics
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
ljy
GeliBusinessPlatform
Commits
4523c257
Commit
4523c257
authored
Apr 16, 2021
by
lujunye
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修复曹尼玛个击吧
parent
7b196ec3
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
16 additions
and
9 deletions
+16
-9
GeliBusinessPlatform.xcworkspace/xcuserdata/junyelu.xcuserdatad/UserInterfaceState.xcuserstate
...erdata/junyelu.xcuserdatad/UserInterfaceState.xcuserstate
+0
-0
GeliBusinessPlatform/Define/Define.swift
GeliBusinessPlatform/Define/Define.swift
+4
-4
GeliBusinessPlatform/Define/NetworkRequest.swift
GeliBusinessPlatform/Define/NetworkRequest.swift
+2
-1
GeliBusinessPlatform/Other/LMNote/LMNoteViewController.m
GeliBusinessPlatform/Other/LMNote/LMNoteViewController.m
+2
-0
GeliBusinessPlatform/Other/LMNote/OtherViews/LMNImageView.m
GeliBusinessPlatform/Other/LMNote/OtherViews/LMNImageView.m
+2
-2
GeliBusinessPlatform/View/Cell/AddGuiGeCell.swift
GeliBusinessPlatform/View/Cell/AddGuiGeCell.swift
+6
-2
No files found.
GeliBusinessPlatform.xcworkspace/xcuserdata/junyelu.xcuserdatad/UserInterfaceState.xcuserstate
View file @
4523c257
No preview for this file type
GeliBusinessPlatform/Define/Define.swift
View file @
4523c257
...
...
@@ -27,10 +27,10 @@ let systemVersion = (UIDevice.current.systemVersion as String)
//接口地址
//test
let
SERVERCE_ImageHost
=
"https://z.gelifood.com/"
let
SERVERCE_HOST
=
"https://z.gelifood.com/admin/"
//
let SERVERCE_ImageHost = "https://zx.gelifood.com/"
//
let SERVERCE_HOST = "https://zx.gelifood.com/admin/"
//
let SERVERCE_ImageHost = "https://z.gelifood.com/"
//
let SERVERCE_HOST = "https://z.gelifood.com/admin/"
let
SERVERCE_ImageHost
=
"https://zx.gelifood.com/"
let
SERVERCE_HOST
=
"https://zx.gelifood.com/admin/"
////online
//视图常量
...
...
GeliBusinessPlatform/Define/NetworkRequest.swift
View file @
4523c257
...
...
@@ -72,7 +72,8 @@ class NetworkRequest {
class
var
sharedInstance
:
NetworkRequest
{
let
serverTrustPolicies
:
[
String
:
ServerTrustPolicy
]
=
[
"z.gelifood.com"
:
.
disableEvaluation
,
"zx.gelifood.com"
:
.
disableEvaluation
"zx.gelifood.com"
:
.
disableEvaluation
,
"cms.gelifood.com"
:
.
disableEvaluation
]
// Create custom manager
if
manager
==
nil
{
...
...
GeliBusinessPlatform/Other/LMNote/LMNoteViewController.m
View file @
4523c257
...
...
@@ -522,6 +522,7 @@
PHImageRequestOptions
*
options
=
[[
PHImageRequestOptions
alloc
]
init
];
options
.
synchronous
=
YES
;
options
.
networkAccessAllowed
=
YES
;
__block
LMNImageView
*
imageView
=
nil
;
[[
PHImageManager
defaultManager
]
requestImageForAsset
:
asset
targetSize
:
targetSize
contentMode
:
PHImageContentModeAspectFill
options
:
options
resultHandler
:^
(
UIImage
*
result
,
NSDictionary
*
info
)
{
...
...
@@ -530,6 +531,7 @@
TestClass
*
model
=
[[
TestClass
alloc
]
init
];
NSMutableDictionary
*
dict
=
[
NSMutableDictionary
dictionaryWithCapacity
:
10
];
[
dict
setValue
:
token
forKey
:
@"user_token"
];
NSLog
(
@"img width = %f"
,
result
.
size
.
width
);
[
model
saveFileWithImage
:
result
params
:
dict
success
:^
(
NSDictionary
<
NSString
*
,
id
>
*
data
)
{
if
([[
NSString
stringWithFormat
:
@"%@"
,
data
[
@"code"
]]
isEqualToString
:
@"1"
])
{
...
...
GeliBusinessPlatform/Other/LMNote/OtherViews/LMNImageView.m
View file @
4523c257
...
...
@@ -84,11 +84,11 @@ static CGFloat const kVerticalMargin = kVerticalInset + kMargin;
// NSString *imgSrc = @"https://c.gelifood.com/";
NSString
*
imgSrc
=
@"https://cms.gelifood.com/"
;
[
self
.
imageView
sd_setImageWithURL
:[
NSURL
URLWithString
:[
NSString
stringWithFormat
:
@"%@%@"
,
imgSrc
,
imageUrl
]]
placeholderImage:
[
UIImage
imageNamed
:
@"lmn_tool_image"
]
options
:(
SDWebImage
RetryFailed
)
completed
:^
(
UIImage
*
image
,
NSError
*
error
,
SDImageCacheType
cacheType
,
NSURL
*
imageURL
)
{
placeholderImage:
[
UIImage
imageNamed
:
@"lmn_tool_image"
]
options
:(
SDWebImage
AllowInvalidSSLCertificates
)
completed
:^
(
UIImage
*
image
,
NSError
*
error
,
SDImageCacheType
cacheType
,
NSURL
*
imageURL
)
{
CGSize
size
=
image
.
size
;
NSLog
(
@"网络图片大小=%f,%f"
,
size
.
width
,
size
.
height
);
NSLog
(
@"url = %@"
,[
NSString
stringWithFormat
:
@"%@%@"
,
imgSrc
,
imageUrl
]);
}];
...
...
GeliBusinessPlatform/View/Cell/AddGuiGeCell.swift
View file @
4523c257
...
...
@@ -42,13 +42,17 @@ class AddGuiGeCell: UITableViewCell ,WKNavigationDelegate{
webView
.
scrollView
.
isScrollEnabled
=
false
webView
.
evaluateJavaScript
(
"document.body.scrollHeight"
)
{
(
result
,
error
)
in
let
h
=
result
as!
CGFloat
print
(
"webH = "
,
h
)
self
.
actp
.
stopAnimating
()
self
.
actp
.
isHidden
=
true
self
.
delegate
?
.
AddGuiGeCellWebViewHeight
?(
height
:
h
)
}
}
func
webView
(
_
webView
:
WKWebView
,
didReceive
challenge
:
URLAuthenticationChallenge
,
completionHandler
:
@escaping
(
URLSession
.
AuthChallengeDisposition
,
URLCredential
?)
->
Void
)
{
if
challenge
.
protectionSpace
.
authenticationMethod
==
NSURLAuthenticationMethodServerTrust
{
let
card
=
URLCredential
.
init
(
trust
:
challenge
.
protectionSpace
.
serverTrust
!
)
completionHandler
(
URLSession
.
AuthChallengeDisposition
.
useCredential
,
card
)
}
}
}
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