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
194edb27
Commit
194edb27
authored
Apr 17, 2020
by
刘俊宏
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
新增仓库管理的cell
parent
c8794a95
Changes
6
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
50 additions
and
10 deletions
+50
-10
GeliBusinessPlatform.xcodeproj/project.pbxproj
GeliBusinessPlatform.xcodeproj/project.pbxproj
+16
-0
GeliBusinessPlatform.xcworkspace/xcuserdata/liujunhong.xcuserdatad/UserInterfaceState.xcuserstate
...ata/liujunhong.xcuserdatad/UserInterfaceState.xcuserstate
+0
-0
GeliBusinessPlatform/ViewController/仓库管理/WarehoseMangementCell.swift
...sPlatform/ViewController/仓库管理/WarehoseMangementCell.swift
+24
-0
GeliBusinessPlatform/ViewController/仓库管理/WarehoseMangementCell.xib
...essPlatform/ViewController/仓库管理/WarehoseMangementCell.xib
+0
-0
GeliBusinessPlatform/ViewController/登录/LoginViewController.swift
...inessPlatform/ViewController/登录/LoginViewController.swift
+6
-6
GeliBusinessPlatform/ViewController/蓝牙连接/BlueToothCell.xib
GeliBusinessPlatform/ViewController/蓝牙连接/BlueToothCell.xib
+4
-4
No files found.
GeliBusinessPlatform.xcodeproj/project.pbxproj
View file @
194edb27
...
@@ -59,6 +59,8 @@
...
@@ -59,6 +59,8 @@
E0D4166024482AAF008DCAB4
/* AccountViewController.xib in Resources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
E0D4165E24482AAF008DCAB4
/* AccountViewController.xib */
;
};
E0D4166024482AAF008DCAB4
/* AccountViewController.xib in Resources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
E0D4165E24482AAF008DCAB4
/* AccountViewController.xib */
;
};
E0D4166424483058008DCAB4
/* ChangePassViewController.swift in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
E0D4166224483058008DCAB4
/* ChangePassViewController.swift */
;
};
E0D4166424483058008DCAB4
/* ChangePassViewController.swift in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
E0D4166224483058008DCAB4
/* ChangePassViewController.swift */
;
};
E0D4166524483058008DCAB4
/* ChangePassViewController.xib in Resources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
E0D4166324483058008DCAB4
/* ChangePassViewController.xib */
;
};
E0D4166524483058008DCAB4
/* ChangePassViewController.xib in Resources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
E0D4166324483058008DCAB4
/* ChangePassViewController.xib */
;
};
F9023F62244999F500DD5A63
/* WarehoseMangementCell.swift in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
F9023F60244999F500DD5A63
/* WarehoseMangementCell.swift */
;
};
F9023F63244999F500DD5A63
/* WarehoseMangementCell.xib in Resources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
F9023F61244999F500DD5A63
/* WarehoseMangementCell.xib */
;
};
F95D9B5024484FAE0080D6E3
/* GeliAlertView.xib in Resources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
F95D9B4F24484FAE0080D6E3
/* GeliAlertView.xib */
;
};
F95D9B5024484FAE0080D6E3
/* GeliAlertView.xib in Resources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
F95D9B4F24484FAE0080D6E3
/* GeliAlertView.xib */
;
};
F95D9B522448530E0080D6E3
/* GeliAlertView.swift in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
F95D9B512448530E0080D6E3
/* GeliAlertView.swift */
;
};
F95D9B522448530E0080D6E3
/* GeliAlertView.swift in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
F95D9B512448530E0080D6E3
/* GeliAlertView.swift */
;
};
F95D9CA424493E840080D6E3
/* ShopInfoViewController.swift in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
F95D9CA224493E840080D6E3
/* ShopInfoViewController.swift */
;
};
F95D9CA424493E840080D6E3
/* ShopInfoViewController.swift in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
F95D9CA224493E840080D6E3
/* ShopInfoViewController.swift */
;
};
...
@@ -153,6 +155,8 @@
...
@@ -153,6 +155,8 @@
E0D4165E24482AAF008DCAB4
/* AccountViewController.xib */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
file.xib
;
path
=
AccountViewController.xib
;
sourceTree
=
"<group>"
;
};
E0D4165E24482AAF008DCAB4
/* AccountViewController.xib */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
file.xib
;
path
=
AccountViewController.xib
;
sourceTree
=
"<group>"
;
};
E0D4166224483058008DCAB4
/* ChangePassViewController.swift */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
sourcecode.swift
;
path
=
ChangePassViewController.swift
;
sourceTree
=
"<group>"
;
};
E0D4166224483058008DCAB4
/* ChangePassViewController.swift */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
sourcecode.swift
;
path
=
ChangePassViewController.swift
;
sourceTree
=
"<group>"
;
};
E0D4166324483058008DCAB4
/* ChangePassViewController.xib */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
file.xib
;
path
=
ChangePassViewController.xib
;
sourceTree
=
"<group>"
;
};
E0D4166324483058008DCAB4
/* ChangePassViewController.xib */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
file.xib
;
path
=
ChangePassViewController.xib
;
sourceTree
=
"<group>"
;
};
F9023F60244999F500DD5A63
/* WarehoseMangementCell.swift */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
sourcecode.swift
;
path
=
WarehoseMangementCell.swift
;
sourceTree
=
"<group>"
;
};
F9023F61244999F500DD5A63
/* WarehoseMangementCell.xib */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
file.xib
;
path
=
WarehoseMangementCell.xib
;
sourceTree
=
"<group>"
;
};
F95D9B4F24484FAE0080D6E3
/* GeliAlertView.xib */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
file.xib
;
path
=
GeliAlertView.xib
;
sourceTree
=
"<group>"
;
};
F95D9B4F24484FAE0080D6E3
/* GeliAlertView.xib */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
file.xib
;
path
=
GeliAlertView.xib
;
sourceTree
=
"<group>"
;
};
F95D9B512448530E0080D6E3
/* GeliAlertView.swift */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
sourcecode.swift
;
path
=
GeliAlertView.swift
;
sourceTree
=
"<group>"
;
};
F95D9B512448530E0080D6E3
/* GeliAlertView.swift */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
sourcecode.swift
;
path
=
GeliAlertView.swift
;
sourceTree
=
"<group>"
;
};
F95D9CA224493E840080D6E3
/* ShopInfoViewController.swift */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
sourcecode.swift
;
path
=
ShopInfoViewController.swift
;
sourceTree
=
"<group>"
;
};
F95D9CA224493E840080D6E3
/* ShopInfoViewController.swift */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
sourcecode.swift
;
path
=
ShopInfoViewController.swift
;
sourceTree
=
"<group>"
;
};
...
@@ -374,6 +378,7 @@
...
@@ -374,6 +378,7 @@
E09B03AD2445B0BA00211A51
/* ViewController */
=
{
E09B03AD2445B0BA00211A51
/* ViewController */
=
{
isa
=
PBXGroup
;
isa
=
PBXGroup
;
children
=
(
children
=
(
F9023F5F2449996D00DD5A63
/* 仓库管理 */
,
F95D9CA124493AB90080D6E3
/* 商家信息 */
,
F95D9CA124493AB90080D6E3
/* 商家信息 */
,
E0D197CC244855F5002B080C
/* 蓝牙连接 */
,
E0D197CC244855F5002B080C
/* 蓝牙连接 */
,
E0D197C3244845E3002B080C
/* 个人中心 */
,
E0D197C3244845E3002B080C
/* 个人中心 */
,
...
@@ -487,6 +492,15 @@
...
@@ -487,6 +492,15 @@
path
=
"修改密码"
;
path
=
"修改密码"
;
sourceTree
=
"<group>"
;
sourceTree
=
"<group>"
;
};
};
F9023F5F2449996D00DD5A63
/* 仓库管理 */
=
{
isa
=
PBXGroup
;
children
=
(
F9023F60244999F500DD5A63
/* WarehoseMangementCell.swift */
,
F9023F61244999F500DD5A63
/* WarehoseMangementCell.xib */
,
);
path
=
"仓库管理"
;
sourceTree
=
"<group>"
;
};
F95D9B4E24484F140080D6E3
/* AlertView */
=
{
F95D9B4E24484F140080D6E3
/* AlertView */
=
{
isa
=
PBXGroup
;
isa
=
PBXGroup
;
children
=
(
children
=
(
...
@@ -612,6 +626,7 @@
...
@@ -612,6 +626,7 @@
isa
=
PBXResourcesBuildPhase
;
isa
=
PBXResourcesBuildPhase
;
buildActionMask
=
2147483647
;
buildActionMask
=
2147483647
;
files
=
(
files
=
(
F9023F63244999F500DD5A63
/* WarehoseMangementCell.xib in Resources */
,
E0516F832448086700E373CE
/* MsgCenterCell.xib in Resources */
,
E0516F832448086700E373CE
/* MsgCenterCell.xib in Resources */
,
E09B03B72445B85A00211A51
/* LoginViewController.xib in Resources */
,
E09B03B72445B85A00211A51
/* LoginViewController.xib in Resources */
,
E09B03C12445B96500211A51
/* FgPassViewController.xib in Resources */
,
E09B03C12445B96500211A51
/* FgPassViewController.xib in Resources */
,
...
@@ -724,6 +739,7 @@
...
@@ -724,6 +739,7 @@
E09B03C82445BF9300211A51
/* SwiftNotice.swift in Sources */
,
E09B03C82445BF9300211A51
/* SwiftNotice.swift in Sources */
,
E0D4165F24482AAF008DCAB4
/* AccountViewController.swift in Sources */
,
E0D4165F24482AAF008DCAB4
/* AccountViewController.swift in Sources */
,
E01C26B62446AF3100ADCC70
/* DemoViewController.swift in Sources */
,
E01C26B62446AF3100ADCC70
/* DemoViewController.swift in Sources */
,
F9023F62244999F500DD5A63
/* WarehoseMangementCell.swift in Sources */
,
E0516F772448003D00E373CE
/* PayViewController.swift in Sources */
,
E0516F772448003D00E373CE
/* PayViewController.swift in Sources */
,
E09B03A32445AF9500211A51
/* NetworkRequest.swift in Sources */
,
E09B03A32445AF9500211A51
/* NetworkRequest.swift in Sources */
,
E09B03A72445B04E00211A51
/* BaseViewController.swift in Sources */
,
E09B03A72445B04E00211A51
/* BaseViewController.swift in Sources */
,
...
...
GeliBusinessPlatform.xcworkspace/xcuserdata/liujunhong.xcuserdatad/UserInterfaceState.xcuserstate
View file @
194edb27
No preview for this file type
GeliBusinessPlatform/ViewController/仓库管理/WarehoseMangementCell.swift
0 → 100644
View file @
194edb27
//
// WarehoseMangementCell.swift
// GeliBusinessPlatform
//
// Created by 刘俊宏 on 2020/4/17.
// Copyright © 2020 junye lu. All rights reserved.
//
import
UIKit
class
WarehoseMangementCell
:
UITableViewCell
{
override
func
awakeFromNib
()
{
super
.
awakeFromNib
()
// Initialization code
}
override
func
setSelected
(
_
selected
:
Bool
,
animated
:
Bool
)
{
super
.
setSelected
(
selected
,
animated
:
animated
)
// Configure the view for the selected state
}
}
GeliBusinessPlatform/ViewController/仓库管理/WarehoseMangementCell.xib
0 → 100644
View file @
194edb27
This diff is collapsed.
Click to expand it.
GeliBusinessPlatform/ViewController/登录/LoginViewController.swift
View file @
194edb27
...
@@ -80,12 +80,12 @@ class LoginViewController: BaseViewController {
...
@@ -80,12 +80,12 @@ class LoginViewController: BaseViewController {
@IBAction
func
loginAction
(
_
sender
:
Any
)
{
@IBAction
func
loginAction
(
_
sender
:
Any
)
{
print
(
"loginAction"
)
print
(
"loginAction"
)
//
let vc = BluetoothConnectViewController()
let
vc
=
BluetoothConnectViewController
()
//
self.navigationController?.pushViewController(vc, animated: true)
self
.
navigationController
?
.
pushViewController
(
vc
,
animated
:
true
)
let
alertView
=
GeliAlertView
(
frame
:
self
.
view
.
window
!.
bounds
)
//
let alertView = GeliAlertView(frame: self.view.window!.bounds)
alertView
.
tishiLbl
.
text
=
"202121"
;
//
alertView.tishiLbl.text = "202121";
alertView
.
titileLbl
.
text
=
"是否确认取消订单?"
//
alertView.titileLbl.text = "是否确认取消订单?"
self
.
view
.
window
?
.
addSubview
(
alertView
)
//
self.view.window?.addSubview(alertView)
}
}
}
}
GeliBusinessPlatform/ViewController/蓝牙连接/BlueToothCell.xib
View file @
194edb27
<?xml version="1.0" encoding="UTF-8"?>
<?xml version="1.0" encoding="UTF-8"?>
<document
type=
"com.apple.InterfaceBuilder3.CocoaTouch.XIB"
version=
"3.0"
toolsVersion=
"1
5702
"
targetRuntime=
"iOS.CocoaTouch"
propertyAccessControl=
"none"
useAutolayout=
"YES"
useTraitCollections=
"YES"
useSafeAreas=
"YES"
colorMatched=
"YES"
>
<document
type=
"com.apple.InterfaceBuilder3.CocoaTouch.XIB"
version=
"3.0"
toolsVersion=
"1
6096
"
targetRuntime=
"iOS.CocoaTouch"
propertyAccessControl=
"none"
useAutolayout=
"YES"
useTraitCollections=
"YES"
useSafeAreas=
"YES"
colorMatched=
"YES"
>
<device
id=
"retina6_1"
orientation=
"portrait"
appearance=
"light"
/>
<device
id=
"retina6_1"
orientation=
"portrait"
appearance=
"light"
/>
<dependencies>
<dependencies>
<plugIn
identifier=
"com.apple.InterfaceBuilder.IBCocoaTouchPlugin"
version=
"1
5704
"
/>
<plugIn
identifier=
"com.apple.InterfaceBuilder.IBCocoaTouchPlugin"
version=
"1
6086
"
/>
<capability
name=
"Named colors"
minToolsVersion=
"9.0"
/>
<capability
name=
"Named colors"
minToolsVersion=
"9.0"
/>
<capability
name=
"Safe area layout guides"
minToolsVersion=
"9.0"
/>
<capability
name=
"Safe area layout guides"
minToolsVersion=
"9.0"
/>
<capability
name=
"documents saved in the Xcode 8 format"
minToolsVersion=
"8.0"
/>
<capability
name=
"documents saved in the Xcode 8 format"
minToolsVersion=
"8.0"
/>
...
@@ -61,10 +61,10 @@
...
@@ -61,10 +61,10 @@
<resources>
<resources>
<image
name=
"xianshi "
width=
"37"
height=
"24"
/>
<image
name=
"xianshi "
width=
"37"
height=
"24"
/>
<namedColor
name=
"标题字颜色"
>
<namedColor
name=
"标题字颜色"
>
<color
red=
"0.180
00000715255737"
green=
"0.18000000715255737"
blue=
"0.18000000715255737
"
alpha=
"1"
colorSpace=
"custom"
customColorSpace=
"sRGB"
/>
<color
red=
"0.180
3921568627451"
green=
"0.1803921568627451"
blue=
"0.1803921568627451
"
alpha=
"1"
colorSpace=
"custom"
customColorSpace=
"sRGB"
/>
</namedColor>
</namedColor>
<namedColor
name=
"灰色分界线"
>
<namedColor
name=
"灰色分界线"
>
<color
red=
"0.929
00002002716064"
green=
"0.92900002002716064"
blue=
"0.92900002002716064
"
alpha=
"1"
colorSpace=
"custom"
customColorSpace=
"sRGB"
/>
<color
red=
"0.929
41176470588238"
green=
"0.92941176470588238"
blue=
"0.92941176470588238
"
alpha=
"1"
colorSpace=
"custom"
customColorSpace=
"sRGB"
/>
</namedColor>
</namedColor>
</resources>
</resources>
</document>
</document>
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