Skip to content

G
GeliBusinessPlatform
Commit 718dde69 authored by lujunye's avatar lujunye
Browse files
Options

1211122111213ddd

parent 27dd351c
Hide whitespace changes
Inline Side-by-side
Showing with 42 additions and 42 deletions
GeliBusinessPlatform.xcodeproj/project.pbxproj
View file @ 718dde69
......@@ -410,7 +410,7 @@
E0DA8AAE25E8F3D800425099 /* SVIndefiniteAnimatedView.m in Sources */ = {isa = PBXBuildFile; fileRef = E0DA8AA025E8F3D800425099 /* SVIndefiniteAnimatedView.m */; };
E0DA8AAF25E8F3D800425099 /* SVProgressHUD.bundle in Resources */ = {isa = PBXBuildFile; fileRef = E0DA8AA125E8F3D800425099 /* SVProgressHUD.bundle */; };
E0DA8AB025E8F3D800425099 /* HLPrinter.m in Sources */ = {isa = PBXBuildFile; fileRef = E0DA8AA425E8F3D800425099 /* HLPrinter.m */; };
E0DA8AB125E8F3D800425099 /* UIWebView+UIImage.m in Sources */ = {isa = PBXBuildFile; fileRef = E0DA8AA525E8F3D800425099 /* UIWebView+UIImage.m */; };
E0DA8AB125E8F3D800425099 /* WKWebView+UIImage.m in Sources */ = {isa = PBXBuildFile; fileRef = E0DA8AA525E8F3D800425099 /* WKWebView+UIImage.m */; };
E0DA8AB225E8F3D800425099 /* UIImage+Bitmap.m in Sources */ = {isa = PBXBuildFile; fileRef = E0DA8AA825E8F3D800425099 /* UIImage+Bitmap.m */; };
E0DA8ACF25E8F4C000425099 /* BtViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E0DA8ACD25E8F4C000425099 /* BtViewController.m */; };
E0DA8AD025E8F4C000425099 /* BtViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = E0DA8ACE25E8F4C000425099 /* BtViewController.xib */; };
......@@ -1169,9 +1169,9 @@
E0DA8AA125E8F3D800425099 /* SVProgressHUD.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = SVProgressHUD.bundle; sourceTree = "<group>"; };
E0DA8AA225E8F3D800425099 /* SVProgressAnimatedView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVProgressAnimatedView.h; sourceTree = "<group>"; };
E0DA8AA425E8F3D800425099 /* HLPrinter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HLPrinter.m; sourceTree = "<group>"; };
E0DA8AA525E8F3D800425099 /* UIWebView+UIImage.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIWebView+UIImage.m"; sourceTree = "<group>"; };
E0DA8AA525E8F3D800425099 /* WKWebView+UIImage.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "WKWebView+UIImage.m"; sourceTree = "<group>"; };
E0DA8AA625E8F3D800425099 /* UIImage+Bitmap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIImage+Bitmap.h"; sourceTree = "<group>"; };
E0DA8AA725E8F3D800425099 /* UIWebView+UIImage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIWebView+UIImage.h"; sourceTree = "<group>"; };
E0DA8AA725E8F3D800425099 /* WKWebView+UIImage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "WKWebView+UIImage.h"; sourceTree = "<group>"; };
E0DA8AA825E8F3D800425099 /* UIImage+Bitmap.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIImage+Bitmap.m"; sourceTree = "<group>"; };
E0DA8AA925E8F3D800425099 /* HLPrinter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HLPrinter.h; sourceTree = "<group>"; };
E0DA8ACC25E8F4C000425099 /* BtViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BtViewController.h; sourceTree = "<group>"; };
......@@ -2777,12 +2777,12 @@
E0DA8AA325E8F3D800425099 /* HLPrinter */ = {
isa = PBXGroup;
children = (
E0DA8AA425E8F3D800425099 /* HLPrinter.m */,
E0DA8AA525E8F3D800425099 /* UIWebView+UIImage.m */,
E0DA8AA725E8F3D800425099 /* WKWebView+UIImage.h */,
E0DA8AA525E8F3D800425099 /* WKWebView+UIImage.m */,
E0DA8AA625E8F3D800425099 /* UIImage+Bitmap.h */,
E0DA8AA725E8F3D800425099 /* UIWebView+UIImage.h */,
E0DA8AA825E8F3D800425099 /* UIImage+Bitmap.m */,
E0DA8AA925E8F3D800425099 /* HLPrinter.h */,
E0DA8AA425E8F3D800425099 /* HLPrinter.m */,
);
path = HLPrinter;
sourceTree = "<group>";
......@@ -4031,7 +4031,7 @@
buildActionMask = 2147483647;
files = (
F956D5B7246A3255003FF510 /* OrderListModel.swift in Sources */,
E0DA8AB125E8F3D800425099 /* UIWebView+UIImage.m in Sources */,
E0DA8AB125E8F3D800425099 /* WKWebView+UIImage.m in Sources */,
E0A409C32463F31600CFF109 /* ShouZhiTongJiViewController.swift in Sources */,
F950FDE624518B9500C40530 /* FSCalendarAppearance.m in Sources */,
E0974D6C25C140A600E3C86B /* S_Y_Detail_Vc.swift in Sources */,
......@@ -4614,7 +4614,7 @@
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = NO;
CODE_SIGN_ENTITLEMENTS = GeliBusinessPlatform/GeliBusinessPlatform.entitlements;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 4.3;
CURRENT_PROJECT_VERSION = 5.2;
DEFINES_MODULE = NO;
DEVELOPMENT_ASSET_PATHS = "\"GeliBusinessPlatform/Preview Content\"";
DEVELOPMENT_TEAM = K48346UACH;
......@@ -4750,7 +4750,7 @@
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = NO;
CODE_SIGN_ENTITLEMENTS = GeliBusinessPlatform/GeliBusinessPlatform.entitlements;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 4.3;
CURRENT_PROJECT_VERSION = 5.2;
DEFINES_MODULE = NO;
DEVELOPMENT_ASSET_PATHS = "\"GeliBusinessPlatform/Preview Content\"";
DEVELOPMENT_TEAM = K48346UACH;
......
GeliBusinessPlatform/Assets.xcassets/工作中心/items/work入库申请.imageset/Contents.json
View file @ 718dde69
{
"images" : [
{
"filename" : "rukushenqing.png",
"filename" : "rukushenqing_bg.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "rukushenqing@2x.png",
"filename" : "rukushenqing_bg@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "rukushenqing@3x.png",
"filename" : "rukushenqing_bg@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
......
GeliBusinessPlatform/Assets.xcassets/工作中心/items/work出库申请.imageset/Contents.json
View file @ 718dde69
{
"images" : [
{
"filename" : "chukushenqing.png",
"filename" : "chukushenqing_bg.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "chukushenqing@2x.png",
"filename" : "chukushenqing_bg@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "chukushenqing@3x.png",
"filename" : "chukushenqing_bg@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
......
GeliBusinessPlatform/Assets.xcassets/工作中心/items/work待确认订单.imageset/Contents.json
View file @ 718dde69
{
"images" : [
{
"filename" : "daiquerendingdan.png",
"filename" : "daiquerendingdan_bg.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "daiquerendingdan@2x.png",
"filename" : "daiquerendingdan_bg@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "daiquerendingdan@3x.png",
"filename" : "daiquerendingdan_bg@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
......
GeliBusinessPlatform/Assets.xcassets/工作中心/items/work未发货订单.imageset/Contents.json
View file @ 718dde69
{
"images" : [
{
"filename" : "weifahuodingdan.png",
"filename" : "weifahuodingdan_bg.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "weifahuodingdan@2x.png",
"filename" : "weifahuodingdan_bg@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "weifahuodingdan@3x.png",
"filename" : "weifahuodingdan_bg@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
......
GeliBusinessPlatform/Assets.xcassets/工作中心/items/work采购入库.imageset/Contents.json
View file @ 718dde69
{
"images" : [
{
"filename" : "caigouruku.png",
"filename" : "caigouruku_bg.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "caigouruku@2x.png",
"filename" : "caigouruku_bg@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "caigouruku@3x.png",
"filename" : "caigouruku_bg@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
......
GeliBusinessPlatform/Define/Bridge_Header.h
View file @ 718dde69
......@@ -31,6 +31,6 @@
#import "SVProgressHUD.h"
#import "BtViewController.h"
#import "HLPrinter.h"
#import "UIWebView+UIImage.h"
#import "WKWebView+UIImage.h"
#endif /* Bridge_Header_h */
GeliBusinessPlatform/Define/Define.swift
View file @ 718dde69
......@@ -27,15 +27,15 @@ 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
//视图常量
let IS_IPHONE_X = __CGSizeEqualToSize(CGSize(width: 375.0, height: 812.0),UIScreen.main.bounds.size ) || __CGSizeEqualToSize(CGSize(width: 812.0, height: 375.0),UIScreen.main.bounds.size)||__CGSizeEqualToSize(CGSize(width: 414.0, height: 896.0),UIScreen.main.bounds.size ) || __CGSizeEqualToSize(CGSize(width: 896.0, height: 414.0),UIScreen.main.bounds.size)
let IS_IPHONE_X = __CGSizeEqualToSize(CGSize(width: 375.0, height: 812.0),UIScreen.main.bounds.size) || __CGSizeEqualToSize(CGSize(width: 812.0, height: 375.0),UIScreen.main.bounds.size) || __CGSizeEqualToSize(CGSize(width: 414.0, height: 896.0),UIScreen.main.bounds.size ) || __CGSizeEqualToSize(CGSize(width: 896.0, height: 414.0),UIScreen.main.bounds.size)
let glscale = UIScreen.main.bounds.size.width/375
let fullScreenWidth = UIScreen.main.bounds.width //屏幕高度
......
GeliBusinessPlatform/Info.plist
View file @ 718dde69
......@@ -79,8 +79,8 @@
<true/>
<key>UIBackgroundModes</key>
<array>
<string>fetch</string>
<string>bluetooth-central</string>
<string>fetch</string>
<string>remote-notification</string>
</array>
<key>UILaunchImageFile</key>
......
GeliBusinessPlatform/Other/SDK/HLPrinter/HLPrinter/UIWebView+UIImage.h → GeliBusinessPlatform/Other/SDK/HLPrinter/HLPrinter/WKWebView+UIImage.h
View file @ 718dde69
//
// UIWebView+UIImage.h
// HLBluetoothDemo
//
// Created by Harvey on 16/5/13.
......@@ -7,8 +7,8 @@
//
#import <UIKit/UIKit.h>
@interface UIWebView (UIImage)
#import <WebKit/WebKit.h>
@interface WKWebView (UIImage)
/**
* 获取当前加载的网页的截图
......
GeliBusinessPlatform/Other/SDK/HLPrinter/HLPrinter/UIWebView+UIImage.m → GeliBusinessPlatform/Other/SDK/HLPrinter/HLPrinter/WKWebView+UIImage.m
View file @ 718dde69
//
// UIWebView+UIImage.m
// HLBluetoothDemo
//
// Created by Harvey on 16/5/13.
......@@ -8,9 +8,9 @@
#import <QuartzCore/QuartzCore.h>
#import "UIWebView+UIImage.h"
#import "WKWebView+UIImage.h"
@implementation UIWebView (UIImage)
@implementation WKWebView (UIImage)
/**
* 获取当前加载的网页的截图
......
GeliBusinessPlatform/View/AlertView/GeliAltetCodeView.swift
View file @ 718dde69
......@@ -12,9 +12,9 @@ import Foundation
class GeliAltetCodeView: UIView {
var saveImgID: Int? = nil{
didSet{
// saveImg = createQRForString(qrString: "https://cms.gelifood.com/market/src/views/Order/codeDetail.html?order_id=" + StringByInt(number: saveImgID!),qrImageName: "")
saveImg = createQRForString(qrString: "https://cms.gelifood.com/market/src/views/Order/codeDetail.html?order_id=" + StringByInt(number: saveImgID!),qrImageName: "")
saveImg = createQRForString(qrString: "https://c.gelifood.com/market/src/views/Order/codeDetail.html?order_id=" + StringByInt(number: saveImgID!),qrImageName: "")
// saveImg = createQRForString(qrString: "https://c.gelifood.com/market/src/views/Order/codeDetail.html?order_id=" + StringByInt(number: saveImgID!),qrImageName: "")
iconImgV.image = saveImg
}
}
......
GeliBusinessPlatform/ViewController/蓝牙连接/BtViewController.m
View file @ 718dde69
......@@ -10,7 +10,7 @@
#import "HLBLEManager.h"
#import "SVProgressHUD.h"
#import "HLPrinter.h"
#import "UIWebView+UIImage.h"
#import "WKWebView+UIImage.h"
#import "Bt_Cell.h"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment