Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
此号慢热型
o2oa
提交
6f3176e6
o2oa
项目概览
此号慢热型
/
o2oa
与 Fork 源项目一致
Fork自
浙江兰德纵横网络技术股份有限公司 / o2oa
通知
5
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
o2oa
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
6f3176e6
编写于
8月 13, 2020
作者:
F
fancy
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
修复通讯录搜索框按钮看不到的bug
上级
b4e6795f
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
38 addition
and
29 deletion
+38
-29
o2ios/O2Platform/App/Contact-通讯录/View/UnitBreadcrumbViewCell.swift
...latform/App/Contact-通讯录/View/UnitBreadcrumbViewCell.swift
+10
-6
o2ios/O2Platform/App/Work-工作/c/TodoTaskViewController.swift
o2ios/O2Platform/App/Work-工作/c/TodoTaskViewController.swift
+10
-5
o2ios/O2Platform/App/contacts/c/ContactHomeViewController.swift
...O2Platform/App/contacts/c/ContactHomeViewController.swift
+17
-17
o2ios/O2Platform/App/contacts/contacts.storyboard
o2ios/O2Platform/App/contacts/contacts.storyboard
+1
-1
未找到文件。
o2ios/O2Platform/App/Contact-通讯录/View/UnitBreadcrumbViewCell.swift
浏览文件 @
6f3176e6
...
...
@@ -66,12 +66,16 @@ class UnitBreadcrumbViewCell: UITableViewCell {
}
})
}
var
size
=
self
.
breadcrumbScrollView
.
contentSize
;
size
.
width
=
oX
;
self
.
breadcrumbScrollView
.
showsHorizontalScrollIndicator
=
true
;
self
.
breadcrumbScrollView
.
contentSize
=
size
;
self
.
breadcrumbScrollView
.
bounces
=
true
;
var
size
=
self
.
breadcrumbScrollView
.
contentSize
size
.
width
=
oX
self
.
breadcrumbScrollView
.
showsHorizontalScrollIndicator
=
true
self
.
breadcrumbScrollView
.
contentSize
=
size
self
.
breadcrumbScrollView
.
bounces
=
true
//滚动到底部
if
self
.
breadcrumbScrollView
.
contentSize
.
width
>
self
.
breadcrumbScrollView
.
bounds
.
size
.
width
{
let
point
=
CGPoint
(
x
:
self
.
breadcrumbScrollView
.
contentSize
.
width
-
self
.
breadcrumbScrollView
.
bounds
.
size
.
width
+
self
.
breadcrumbScrollView
.
contentInset
.
right
,
y
:
0
)
self
.
breadcrumbScrollView
.
setContentOffset
(
point
,
animated
:
true
)
}
}
}
...
...
o2ios/O2Platform/App/Work-工作/c/TodoTaskViewController.swift
浏览文件 @
6f3176e6
...
...
@@ -107,12 +107,17 @@ class TodoTaskViewController: UITableViewController {
self
.
searchController
.
dimsBackgroundDuringPresentation
=
false
self
.
searchController
.
hidesNavigationBarDuringPresentation
=
false
definesPresentationContext
=
true
UIBarButtonItem
.
appearance
(
whenContainedInInstancesOf
:
[
UISearchBar
.
self
])
.
title
=
"取消"
let
attrs
=
[
NSAttributedString
.
Key
.
font
:
UIFont
.
init
(
name
:
"PingFangTC-Light"
,
size
:
14
)
??
UIFont
.
systemFont
(
ofSize
:
14
),
NSAttributedString
.
Key
.
foregroundColor
:
O2ThemeManager
.
color
(
for
:
"Base.base_color"
)
??
UIColor
.
red
]
UIBarButtonItem
.
appearance
(
whenContainedInInstancesOf
:
[
UISearchBar
.
self
])
.
setTitleTextAttributes
(
attrs
,
for
:
.
normal
)
self
.
searchController
.
searchBar
.
searchBarStyle
=
UISearchBar
.
Style
.
minimal
self
.
searchController
.
searchBar
.
sizeToFit
()
self
.
searchController
.
searchBar
.
backgroundColor
=
RGB
(
251
,
g
:
71
,
b
:
71
)
self
.
searchController
.
searchBar
.
setImage
(
UIImage
(
named
:
"contact_search"
),
for
:
.
search
,
state
:
.
normal
)
if
let
searchField
=
self
.
searchController
.
searchBar
.
value
(
forKey
:
"searchField"
)
as?
UITextField
{
searchField
.
textColor
=
.
white
}
//
self.searchController.searchBar.backgroundColor = RGB(251, g: 71, b: 71)
//
self.searchController.searchBar.setImage(UIImage(named: "contact_search"), for: .search, state: .normal)
//
if let searchField = self.searchController.searchBar.value(forKey: "searchField") as? UITextField {
//
searchField.textColor = .white
//
}
//设置搜索框是否显示
self
.
setSearchBarIsShow
()
...
...
o2ios/O2Platform/App/contacts/c/ContactHomeViewController.swift
浏览文件 @
6f3176e6
...
...
@@ -83,11 +83,11 @@ class ContactHomeViewController: UITableViewController {
searchController
.
searchResultsUpdater
=
self
searchController
.
dimsBackgroundDuringPresentation
=
false
//
searchController.hidesNavigationBarDuringPresentation = false
searchController
.
hidesNavigationBarDuringPresentation
=
false
UIBarButtonItem
.
appearance
(
whenContainedInInstancesOf
:
[
UISearchBar
.
self
])
.
title
=
"取消"
let
textFont
=
UIFont
(
name
:
"PingFangTC-Light"
,
size
:
14.0
)
let
attrs
=
[
NSAttributedString
.
Key
.
font
:
textFont
!
]
let
attrs
=
[
NSAttributedString
.
Key
.
font
:
UIFont
.
init
(
name
:
"PingFangTC-Light"
,
size
:
14
)
??
UIFont
.
systemFont
(
ofSize
:
14
),
NSAttributedString
.
Key
.
foregroundColor
:
O2ThemeManager
.
color
(
for
:
"Base.base_color"
)
??
UIColor
.
red
]
UIBarButtonItem
.
appearance
(
whenContainedInInstancesOf
:
[
UISearchBar
.
self
])
.
setTitleTextAttributes
(
attrs
,
for
:
.
normal
)
searchController
.
searchBar
.
searchBarStyle
=
UISearchBar
.
Style
.
minimal
...
...
@@ -241,7 +241,7 @@ class ContactHomeViewController: UITableViewController {
DDLogError
(
"error message =
\(
value
[
"message"
]
)
"
)
}
case
.
failure
(
let
err
):
DDLog
Debug
(
err
as?
String
??
"未知错误"
)
DDLog
Error
(
err
.
localizedDescription
)
}
}
}
...
...
@@ -372,33 +372,33 @@ class ContactHomeViewController: UITableViewController {
extension
ContactHomeViewController
:
UISearchControllerDelegate
{
func
willPresentSearchController
(
_
searchController
:
UISearchController
)
{
NSLog
(
"willPresentSearchController"
)
searchController
.
searchBar
.
searchBarStyle
=
UISearchBar
.
Style
.
default
self
.
tableView
.
mj_header
.
isHidden
=
true
//
searchController.searchBar.searchBarStyle = UISearchBar.Style.default
//
self.tableView.mj_header.isHidden = true
}
func
didPresentSearchController
(
_
searchController
:
UISearchController
)
{
NSLog
(
"didPresentSearchController"
)
UIView
.
animate
(
withDuration
:
0.1
,
animations
:{
()
->
Void
in
self
.
tableView
.
contentInset
=
UIEdgeInsets
(
top
:
25
,
left
:
0
,
bottom
:
0
,
right
:
0
)
})
//
UIView.animate(withDuration: 0.1, animations:{
//
()-> Void in
//
self.tableView.contentInset = UIEdgeInsets(top: 25, left: 0, bottom: 0, right: 0)
//
})
}
func
willDismissSearchController
(
_
searchController
:
UISearchController
)
{
NSLog
(
"willDismissSearchController"
)
searchController
.
searchBar
.
searchBarStyle
=
UISearchBar
.
Style
.
minimal
//
searchController.searchBar.searchBarStyle = UISearchBar.Style.minimal
}
func
didDismissSearchController
(
_
searchController
:
UISearchController
)
{
NSLog
(
"didDismissSearchController"
)
UIView
.
animate
(
withDuration
:
0.15
,
animations
:{
()
->
Void
in
self
.
tableView
.
contentInset
=
UIEdgeInsets
(
top
:
0
,
left
:
0
,
bottom
:
0
,
right
:
0
)
},
completion
:{(
finished
:
Bool
)
->
Void
in
self
.
tableView
.
mj_header
.
isHidden
=
false
})
//
UIView.animate(withDuration: 0.15, animations:{
//
()-> Void in
//
self.tableView.contentInset = UIEdgeInsets(top: 0, left: 0, bottom: 0, right: 0)
//
},completion:{(finished:Bool) -> Void in
//
self.tableView.mj_header.isHidden = false
//
})
}
...
...
o2ios/O2Platform/App/contacts/contacts.storyboard
浏览文件 @
6f3176e6
...
...
@@ -623,7 +623,7 @@
</scene>
</scenes>
<inferredMetricsTieBreakers>
<segue
reference=
"
ou3-1r-djP
"
/>
<segue
reference=
"
PJp-HH-i6F
"
/>
<segue
reference=
"JCQ-fv-wZ7"
/>
<segue
reference=
"5hh-6u-Olo"
/>
<segue
reference=
"EGH-4l-bNL"
/>
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录