self.tabBar.backgroundColor = .white
view.backgroundColor = .color(.bgColor)
- self.selectedIndex = 3
+ self.selectedIndex = 0
}
}
override func setupLayout() {
titleLabel.snp.makeConstraints { make in
make.top.equalToSuperview().inset(20)
- make.left.right.equalToSuperview().inset(18)
+ make.left.right.equalToSuperview().inset(34)
}
bgView.snp.makeConstraints { make in
make.left.right.equalToSuperview().inset(18)
view.addSubview(bg)
toolBar.delegate = self
+ toolBar.isChienseEnglish = true
tableView.backgroundColor = .clear
tableView.delegate = self
let leftItem = RecordBarItem()
let rightItem = RecordBarItem()
var delegate:RecordBarDelegate?
+ var isChienseEnglish = false{
+ didSet{
+ if isChienseEnglish {
+ leftItem.icon.isHidden = true
+ rightItem.icon.isHidden = true
+ }
+ else{
+ leftItem.icon.isHidden = false
+ rightItem.icon.isHidden = false
+ }
+ }
+ }
override func setupViews() {
backgroundColor = .hexString("#F7F7F7")
}
@objc func leftAction(){
+ if isChienseEnglish {
+ return
+ }
if recordBtn.activeView.animating {
return
}
}
}
@objc func rightAction(){
+ if isChienseEnglish {
+ return
+ }
if recordBtn.activeView.animating {
return
}
v.dataSource = self
v.rowHeight = 52
v.separatorStyle = .none
+ v.contentInset = UIEdgeInsets(top: 10, left: 0, bottom: 0, right: 0)
v.register(SelectCell.self, forCellReuseIdentifier: SelectCell.reuseID)
}
view.addSubviews([tableView,btn])
dateLabel.text = model.createTime
typeLabel.text = model.type.title
durationLabel.text = YLToos.formatSeconds(model.duration)
+ titleLabel.textColor = model.favorite == "0" ? UIColor.hexString("#121212"):.color(.theme)
collectionIcon.image = UIImage(named: model.favorite == "0" ? "collection_normal":"collection_selected")
}
}
dateLabel.text = localModel.createTime
typeLabel.text = localModel.type.title
durationLabel.text = YLToos.formatSeconds(localModel.duration)
+ titleLabel.textColor = localModel.favorite == "0" ? UIColor.hexString("#121212"):.color(.theme)
collectionIcon.image = UIImage(named: localModel.favorite == "0" ? "collection_normal":"collection_selected")
}
}
v.delegate = self
v.dataSource = self
v.rowHeight = 52
+ v.contentInset = UIEdgeInsets(top: 10, left: 0, bottom: 0, right: 0)
v.separatorStyle = .none
v.register(SelectCell.self, forCellReuseIdentifier: SelectCell.reuseID)
v.tableHeaderView = ShareHeaderView(frame: CGRect(x: 0, y: 0, width: kScreenWid, height: 70))
}
override func setupViews() {
navBar.do { v in
- v.title = "历史录音"
+ v.title = "历史记录"
let items = [NavigationRightItem(image: UIImage(named: "filter"),target: self, action: #selector(filterAction)),NavigationRightItem(image: UIImage(named: "search"), target: self,action: #selector(searchAction))]
v.setupRightViews(items)
}
}
override func setupData() {
list = RecordCache.shared.getList()
+ list = list.sorted(by: {$0.createTime > $1.createTime})
tableView.reloadData()
}
@objc func searchAction(){
enum FontType:Int{
- case min = 10
+ case min = 12
case stand = 14
case big = 18
var title:String{
textView.do { v in
v.text = ""
v.textColor = .hexString("#121212")
- v.contentInset = UIEdgeInsets(top: 0, left: 18, bottom: 0, right: 18)
+ v.contentInset = UIEdgeInsets(top: 0, left: 13, bottom: 0, right: 13)
v.backgroundColor = .clear
v.isEditable = false
}
}
translateTextView.do { v in
v.textView.textColor = .hexString("#121212")
- v.placeHolde = "此处将显示原文译文"
+ v.placeHolde = "此处将显示译文"
v.bgView.yc.addgradientLayer(colors: [.hexString("#0092E1"),.hexString("#F7F7F7")], direction: .top2down,rect: CGRect(x: 0, y: 0, width: kScreenWid, height: (kScreenHei - kNavBtm - 120 - 10)/2))
v.bgView.alpha = 0.1
v.yc.setCorners(withRoundedRect: CGRect(x: 0, y: 0, width: kScreenWid, height: (kScreenHei - kNavBtm - 120 - 10)/2), roundingCorners: [.topLeft,.topRight], cornerRadii: CGSize(width: 20, height: 20))
view.addSubviews([languageItem,scrollView])
scrollView.addSubviews([toolBar,tableView])
+ scrollView.do { v in
+ v.backgroundColor = .clear
+ }
tableView.do { v in
v.keyboardDismissMode = .onDragWithAccessory
v.backgroundColor = .clear
make.top.equalToSuperview()
make.left.equalToSuperview()
make.width.equalTo(kScreenWid)
- make.height.equalTo(kScreenHei - kNavBtm - 56 - 82)
+ make.height.equalTo(kScreenHei - kNavBtm - 56 - 82 - 10)
}
toolBar.snp.makeConstraints { make in
// Do any additional setup after loading the view.
}
override func setupViews() {
- self.navBar.title = "关于我们"
+ self.navBar.title = "关于"
tableView.do { v in
v.backgroundColor = .color(.bgColor)
v.delegate = self
cell.type = list[indexPath.section][indexPath.row]
let rect = CGRect(x: 0, y: 0, width: kScreenWid - 36, height: 52)
if indexPath.row == 0 {
- cell.bgView.yc.setCorners(withRoundedRect: rect, roundingCorners: [.topLeft,.topRight], cornerRadii: CGSize(width: 8, height: 8))
+ cell.bgView.yc.setCorners(withRoundedRect: rect, roundingCorners: [.topLeft,.topRight], cornerRadii: CGSize(width: 12, height: 12))
}
else if indexPath.row == list[indexPath.section].count - 1{
- cell.bgView.yc.setCorners(withRoundedRect: rect, roundingCorners: [.bottomLeft,.bottomRight], cornerRadii: CGSize(width: 8, height: 8))
+ cell.bgView.yc.setCorners(withRoundedRect: rect, roundingCorners: [.bottomLeft,.bottomRight], cornerRadii: CGSize(width: 12, height: 12))
}
else{
cell.bgView.yc.setCorners(withRoundedRect: rect, roundingCorners: [.allCorners], cornerRadii: CGSize(width: 0, height: 0))
}
if cell.type == .revoke {
- cell.bgView.yc.setCorners(withRoundedRect: rect, roundingCorners: [.allCorners], cornerRadii: CGSize(width: 8, height: 8))
+ cell.bgView.yc.setCorners(withRoundedRect: rect, roundingCorners: [.allCorners], cornerRadii: CGSize(width: 12, height: 12))
}
return cell
func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {
let view = CustomSectionHeader.header(withTableView: tableView)
view.titleLabel.text = list[section].title
+ view.titleLabel.textColor = .hexString("#666666")
return view
}
func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
cell.type = list[indexPath.row]
let rect = CGRect(x: 0, y: 0, width: kScreenWid - 36, height: 52)
if indexPath.row == 0 {
- cell.bgView.yc.setCorners(withRoundedRect: rect, roundingCorners: [.topLeft,.topRight], cornerRadii: CGSize(width: 8, height: 8))
+ cell.bgView.yc.setCorners(withRoundedRect: rect, roundingCorners: [.topLeft,.topRight], cornerRadii: CGSize(width: 12, height: 12))
}
else if indexPath.row == list.count - 1{
- cell.bgView.yc.setCorners(withRoundedRect: rect, roundingCorners: [.bottomLeft,.bottomRight], cornerRadii: CGSize(width: 8, height: 8))
+ cell.bgView.yc.setCorners(withRoundedRect: rect, roundingCorners: [.bottomLeft,.bottomRight], cornerRadii: CGSize(width: 12, height: 12))
}
else{
cell.bgView.yc.setCorners(withRoundedRect: rect, roundingCorners: [.allCorners], cornerRadii: CGSize(width: 0, height: 0))
}
+ if list.count == 1 {
+ cell.bgView.yc.setCorners(withRoundedRect: rect, roundingCorners: [.allCorners], cornerRadii: CGSize(width: 12, height: 12))
+ }
return cell
}
func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
m.right.equalToSuperview().inset(40)
}
valueLabel.snp.makeConstraints { (m) in
- m.bottom.equalToSuperview().inset(5)
+ m.bottom.equalToSuperview().inset(2)
m.left.equalTo(icon.snp.right).offset(15)
}
nextIcon.snp.makeConstraints { (m) in
m.width.equalTo(8)
m.height.equalTo(12)
- m.right.equalToSuperview().inset(15)
+ m.right.equalToSuperview().inset(33)
m.centerY.equalToSuperview()
}
}
v.backgroundColor = UIColor.white
}
titleLabel.do { (v) in
- v.textColor = .rgb(0x666666)
+ v.textColor = .rgb(0x21212)
v.font = .bold(14)
v.textAlignment = .left
}
bgView.snp.makeConstraints { make in
make.top.equalTo(kNavBtm + 10)
make.width.equalTo(kScreenWid - 36)
- make.height.equalTo(kScreenHei - kNavBtm - 20)
+// make.height.equalTo(kScreenHei - kNavBtm - 20)
+ make.height.equalTo(620)
+
make.left.equalToSuperview().inset(18)
}
typeView.snp.makeConstraints { make in
else{
cell.bgView.yc.setCorners(withRoundedRect: rect, roundingCorners: [.allCorners], cornerRadii: CGSize(width: 0, height: 0))
}
+ if list.count == 1 {
+ cell.bgView.yc.setCorners(withRoundedRect: rect, roundingCorners: [.allCorners], cornerRadii: CGSize(width: 12, height: 12))
+ }
return cell
}
func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
}
override func setupViews() {
- self.navBar.title = "语言"
+ self.navBar.title = "语言设置"
}
override func setupLayout() {
}
override func setupViews() {
navBar.do { v in
- v.title = "登录设备管理"
+ v.title = model.deviceName
}
footerView.model = model
if indexPath.row == 0 {
cell.bgView.yc.setCorners(withRoundedRect: rect, roundingCorners: [.topLeft,.topRight], cornerRadii: CGSize(width: 12, height: 12))
}
- else if indexPath.row == 4{
+ else if indexPath.row == list.count - 1{
cell.bgView.yc.setCorners(withRoundedRect: rect, roundingCorners: [.bottomLeft,.bottomRight], cornerRadii: CGSize(width: 12, height: 12))
}
else{
cell.bgView.yc.setCorners(withRoundedRect: rect, roundingCorners: [.allCorners], cornerRadii: CGSize(width: 0, height: 0))
}
+
let model = list[indexPath.row]
cell.model = model
return cell
import UIKit
class MoreSetVC: BaseVC{
let tableView = UITableView(frame: .zero, style: .plain)
- let list:[CustomCellType] = [.notice,.system]
-
+// let list:[CustomCellType] = [.notice,.system]
+ let list:[CustomCellType] = [.system]
+
let switchBtn = CustomButton()
let logoutBtn = CustomButton()
let deactivateBtn = CustomButton()
v.font = .regular(14)
v.textColor = .hexString("#666666")
v.numberOfLines = 0
- v.text = "请您确保您是有权进行本撤回同意隐私政策操作的相关当事人。撤回同意隐私政策，您将放弃以下资产或者权益:\n1.数据清空\n将会停止收集您的个人信息。您使用DeepChords应用过程中产生的数据将被清空;手机中DeepChords应用的缓存数据将被清除。\n2.设备解除绑定\nDeepChords账号中，所有设备会与您当前登录的账号解除绑定，并清除设备之前存储在服务器的数据。存储在物理设备中的数据请通过人工本地物理重置来清除。如果您需要重新使用设备，需要您再次进行绑定并且重新授权。\n3.其他\n此举还将撤回您对用户协议的同意，并退出DeepChor ds应用。\n请您知悉，撤回同意隐私政策不代表撤回同意前的相关行为和责任得到豁免或减轻。若您需要重新在该账号管理设备，需要您重新授权并绑定。请谨慎操作!"
+ v.text = "请您确保您是有权进行本撤回同意隐私政策操作的相关当事人。撤回同意隐私政策，您将放弃以下资产或者权益:\n\n1.数据清空\n将会停止收集您的个人信息。您使用DeepChords应用过程中产生的数据将被清空;手机中DeepChords应用的缓存数据将被清除。\n\n2.设备解除绑定\nDeepChords账号中，所有设备会与您当前登录的账号解除绑定，并清除设备之前存储在服务器的数据。存储在物理设备中的数据请通过人工本地物理重置来清除。如果您需要重新使用设备，需要您再次进行绑定并且重新授权。\n\n3.其他\n此举还将撤回您对用户协议的同意，并退出DeepChor ds应用。\n\n请您知悉，撤回同意隐私政策不代表撤回同意前的相关行为和责任得到豁免或减轻。若您需要重新在该账号管理设备，需要您重新授权并绑定。请谨慎操作!"
}
btn.set(title: "确认撤回", style: .theme4,target: self, action: #selector(btnAction))
}
cell.type = list[indexPath.row]
let rect = CGRect(x: 0, y: 0, width: kScreenWid - 36, height: 52)
if indexPath.row == 0 {
- cell.bgView.yc.setCorners(withRoundedRect: rect, roundingCorners: [.topLeft,.topRight], cornerRadii: CGSize(width: 8, height: 8))
+ cell.bgView.yc.setCorners(withRoundedRect: rect, roundingCorners: [.topLeft,.topRight], cornerRadii: CGSize(width: 12, height: 12))
}
else if indexPath.row == list.count - 1{
- cell.bgView.yc.setCorners(withRoundedRect: rect, roundingCorners: [.bottomLeft,.bottomRight], cornerRadii: CGSize(width: 8, height: 8))
+ cell.bgView.yc.setCorners(withRoundedRect: rect, roundingCorners: [.bottomLeft,.bottomRight], cornerRadii: CGSize(width: 12, height: 12))
}
else{
cell.bgView.yc.setCorners(withRoundedRect: rect, roundingCorners: [.allCorners], cornerRadii: CGSize(width: 0, height: 0))
v.backgroundColor = UIColor.white
}
titleLabel.do { (v) in
- v.textColor = .rgb(0x666666)
+
+ v.textColor = .rgb(0x121212)
v.font = .bold(14)
v.textAlignment = .left
}
valueLabel.do { v in
- v.textColor = .rgb(0x121212)
+ v.textColor = .rgb(0x666666)
v.font = .regular(14)
v.textAlignment = .right
}
cell.type = list[indexPath.row]
let rect = CGRect(x: 0, y: 0, width: kScreenWid - 36, height: 52)
if indexPath.row == 0 {
- cell.bgView.yc.setCorners(withRoundedRect: rect, roundingCorners: [.topLeft,.topRight], cornerRadii: CGSize(width: 8, height: 8))
+ cell.bgView.yc.setCorners(withRoundedRect: rect, roundingCorners: [.topLeft,.topRight], cornerRadii: CGSize(width: 12, height: 12))
}
else if indexPath.row == list.count - 1{
- cell.bgView.yc.setCorners(withRoundedRect: rect, roundingCorners: [.bottomLeft,.bottomRight], cornerRadii: CGSize(width: 8, height: 8))
+ cell.bgView.yc.setCorners(withRoundedRect: rect, roundingCorners: [.bottomLeft,.bottomRight], cornerRadii: CGSize(width: 12, height: 12))
}
else{
cell.bgView.yc.setCorners(withRoundedRect: rect, roundingCorners: [.allCorners], cornerRadii: CGSize(width: 0, height: 0))
override func setupViews() {
self.navBar.title = "查找耳机"
- navBar.backgroundColor = .white
+ navBar.backgroundColor = .clear
view.backgroundColor = .color(.bgColor)
view.addSubviews([titleLabel,desLabel,leftRadar,rightRadar,leftBtn,rightBtn])
v.font = .regular(18)
v.yc.setCornerRadius(15)
v.textAlignment = .center
- v.backgroundColor = UIColor.hexString("#0092E1")
+
v.textColor = .white
}
+ start = false
}
override func setupLayout() {
valueLabel.snp.makeConstraints { make in
if start {
rippleView.startAnimating()
backgroundColor = .clear
+ valueLabel.textColor = .white
+ valueLabel.backgroundColor = UIColor.hexString("#0092E1")
}
else{
rippleView.stopAnimating()
backgroundColor = UIColor.hexString("#0092E1").withAlphaComponent(0.1)
+ valueLabel.textColor = UIColor.hexString("#0092E1")
+ valueLabel.backgroundColor = UIColor.clear
}
}
}
v.backgroundColor = UIColor.white
}
titleLabel.do { (v) in
- v.textColor = .rgb(0x666666)
+ v.textColor = .rgb(0x121212)
+
v.font = .bold(14)
v.textAlignment = .left
}
valueLabel.do { v in
- v.textColor = .rgb(0x121212)
+ v.textColor = .rgb(0x666666)
v.font = .regular(14)
v.textAlignment = .right
}
var des1:String{
switch self {
case .dialog:
- return "靠近手机讲母语，手机外放译文"
+ return "一方手持手机，一方戴上耳机，对手机发言时,耳机播放译文，对耳机发言时，手机播放译文"
case .chinese2english:
return "两人各佩戴一只耳机，选择源语言语种， 双方耳机中播放目标语言"
case .tongchuan:
var des2:String{
switch self {
case .dialog:
- return "- 情景示例 -\n张张靠近手机讲中文，手机外放英语"
+ return "- 情景示例 -\n张张靠近手机讲中文，对方耳机播放英语"
case .chinese2english:
return "- 情景示例 -\n张张戴一只耳机讲中文，双方耳机播放英文翻译 Lucy切换为英语发言后，双方耳机中播报中文翻译"
case .tongchuan:
m.left.right.equalToSuperview().inset(40)
}
desLabel2.snp.makeConstraints { (m) in
- m.top.equalTo(desLabel1.snp.bottom).offset(30)
+ m.top.equalTo(tipsIcon.snp.bottom).offset(80)
m.left.right.equalToSuperview().inset(30)
}
actionbtn.snp.makeConstraints { (m) in
projects / mirrors / ShenYin.git / commitdiff