Browse Source

【代码优化】1、删除plist的UIBackgroundModes第一个元素为audio;2、替换部分图标;3、注释钱包支付宝,注释所有关于支付宝字眼。

master
公司电脑 1 year ago
parent
commit
223582b774
  1. BIN
      FireBoltt.xcworkspace/xcuserdata/ecell.xcuserdatad/UserInterfaceState.xcuserstate
  2. 16
      FireBoltt.xcworkspace/xcuserdata/ecell.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
  3. 2
      FireBoltt/Const/MultiLanguageKey.swift
  4. 4
      FireBoltt/FB_Modules/FB_Bluetooth/BLEBaseBlFireBoltt.h
  5. 2
      FireBoltt/FB_Modules/FB_Bluetooth/BLEBaseBlFireBoltt.m
  6. 16
      FireBoltt/FB_Modules/FB_Device/Controller/PaymentCodeViewControllers.swift
  7. 20
      FireBoltt/FB_Modules/FB_My/Controller/MineViewController.swift
  8. 11
      FireBoltt/FB_Modules/FB_My/MineHeaderView.swift
  9. BIN
      FireBoltt/Resource/Assets.xcassets/DeviceImg/fb_default_device_icon.imageset/缺省图-未绑定设备@2x.png
  10. BIN
      FireBoltt/Resource/Assets.xcassets/DeviceImg/fb_default_device_icon.imageset/缺省图-未绑定设备@3x.png
  11. BIN
      FireBoltt/Resource/Assets.xcassets/DeviceImg/fb_icon_device.imageset/icon_手环默认图@2x.png
  12. BIN
      FireBoltt/Resource/Assets.xcassets/DeviceImg/fb_icon_device.imageset/icon_手环默认图@3x.png
  13. BIN
      FireBoltt/Resource/Assets.xcassets/DeviceImg/fb_icon_tick.imageset/icon_tick@2x.png
  14. BIN
      FireBoltt/Resource/Assets.xcassets/DeviceImg/fb_icon_tick.imageset/icon_tick@3x.png
  15. BIN
      FireBoltt/Resource/Assets.xcassets/DeviceImg/fb_icon_watch_connect.imageset/icon_watch_connect@2x.png
  16. BIN
      FireBoltt/Resource/Assets.xcassets/DeviceImg/fb_icon_watch_connect.imageset/icon_watch_connect@3x.png
  17. BIN
      FireBoltt/Resource/Assets.xcassets/DeviceImg/fb_icon_watch_not connect.imageset/icon_watch_not connect@2x.png
  18. BIN
      FireBoltt/Resource/Assets.xcassets/DeviceImg/fb_icon_watch_not connect.imageset/icon_watch_not connect@3x.png
  19. BIN
      FireBoltt/Resource/Assets.xcassets/DeviceImg/fb_power_charge_icon.imageset/power_charge@2x.png
  20. BIN
      FireBoltt/Resource/Assets.xcassets/DeviceImg/fb_power_charge_icon.imageset/power_charge@3x.png
  21. BIN
      FireBoltt/Resource/Assets.xcassets/DeviceImg/fb_scanDevice_default_icon.imageset/缺省图-未搜索到设备@2x.png
  22. BIN
      FireBoltt/Resource/Assets.xcassets/DeviceImg/fb_scanDevice_default_icon.imageset/缺省图-未搜索到设备@3x.png
  23. BIN
      FireBoltt/Resource/Assets.xcassets/DeviceImg/fb_update_icon.imageset/缺省图-升级设备@2x.png
  24. BIN
      FireBoltt/Resource/Assets.xcassets/DeviceImg/fb_update_icon.imageset/缺省图-升级设备@3x.png
  25. BIN
      FireBoltt/Resource/Assets.xcassets/DeviceImg/power_0.imageset/power_0@2x.png
  26. BIN
      FireBoltt/Resource/Assets.xcassets/DeviceImg/power_0.imageset/power_0@3x.png
  27. BIN
      FireBoltt/Resource/Assets.xcassets/DeviceImg/power_1.imageset/power_1@2x.png
  28. BIN
      FireBoltt/Resource/Assets.xcassets/DeviceImg/power_1.imageset/power_1@3x.png
  29. BIN
      FireBoltt/Resource/Assets.xcassets/DeviceImg/power_2.imageset/power_2@2x.png
  30. BIN
      FireBoltt/Resource/Assets.xcassets/DeviceImg/power_2.imageset/power_2@3x.png
  31. BIN
      FireBoltt/Resource/Assets.xcassets/DeviceImg/power_3.imageset/power_3@2x.png
  32. BIN
      FireBoltt/Resource/Assets.xcassets/DeviceImg/power_3.imageset/power_3@3x.png
  33. BIN
      FireBoltt/Resource/Assets.xcassets/DeviceImg/power_4.imageset/power_4@2x.png
  34. BIN
      FireBoltt/Resource/Assets.xcassets/DeviceImg/power_4.imageset/power_4@3x.png
  35. BIN
      FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_badminton.imageset/fb_icon_badminton@2x.png
  36. BIN
      FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_badminton.imageset/fb_icon_badminton@3x.png
  37. BIN
      FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_basketball.imageset/fb_icon_basketball@2x.png
  38. BIN
      FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_basketball.imageset/fb_icon_basketball@3x.png
  39. BIN
      FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_bike.imageset/fb_icon_bike@2x.png
  40. BIN
      FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_bike.imageset/fb_icon_bike@3x.png
  41. BIN
      FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_bm.imageset/fb_icon_bm@2x.png
  42. BIN
      FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_bm.imageset/fb_icon_bm@3x.png
  43. BIN
      FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_cadence.imageset/fb_icon_cadence@2x.png
  44. BIN
      FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_cadence.imageset/fb_icon_cadence@3x.png
  45. BIN
      FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_calories.imageset/icon_Calories@2x.png
  46. BIN
      FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_calories.imageset/icon_Calories@3x.png
  47. BIN
      FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_climb.imageset/fb_icon_climb@2x.png
  48. BIN
      FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_climb.imageset/fb_icon_climb@3x.png
  49. BIN
      FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_date.imageset/icon_date@2x.png
  50. BIN
      FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_date.imageset/icon_date@3x.png
  51. BIN
      FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_football.imageset/fb_icon_football@2x.png
  52. BIN
      FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_football.imageset/fb_icon_football@3x.png
  53. BIN
      FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_free.imageset/fb_icon_free@2x.png
  54. BIN
      FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_free.imageset/fb_icon_free@3x.png
  55. BIN
      FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_gym.imageset/fb_icon_gym@2x.png
  56. BIN
      FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_gym.imageset/fb_icon_gym@3x.png
  57. BIN
      FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_heartRate.imageset/icon_heartRate@2x.png
  58. BIN
      FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_heartRate.imageset/icon_heartRate@3x.png
  59. BIN
      FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_indoor_cycling.imageset/fb_icon_indoor_cycling@2x.png
  60. BIN
      FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_indoor_cycling.imageset/fb_icon_indoor_cycling@3x.png
  61. BIN
      FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_indoor_walking.imageset/fb_icon_indoor_walking@2x.png
  62. BIN
      FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_indoor_walking.imageset/fb_icon_indoor_walking@3x.png
  63. BIN
      FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_pace.imageset/icon_Average pace@2x.png
  64. BIN
      FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_pace.imageset/icon_Average pace@3x.png
  65. BIN
      FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_pingpong.imageset/fb_icon_pingpong@2x.png
  66. BIN
      FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_pingpong.imageset/fb_icon_pingpong@3x.png
  67. BIN
      FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_run.imageset/fb_icon_run@2x.png
  68. BIN
      FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_run.imageset/fb_icon_run@3x.png
  69. BIN
      FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_runindoor.imageset/fb_icon_runindoor@2x.png
  70. BIN
      FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_runindoor.imageset/fb_icon_runindoor@3x.png
  71. BIN
      FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_sex.imageset/fb_icon_sex@2x.png
  72. BIN
      FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_sex.imageset/fb_icon_sex@3x.png
  73. BIN
      FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_skating.imageset/fb_icon_skating@2x.png
  74. BIN
      FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_skating.imageset/fb_icon_skating@3x.png
  75. BIN
      FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_skipping.imageset/fb_icon_skipping@2x.png
  76. BIN
      FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_skipping.imageset/fb_icon_skipping@3x.png
  77. BIN
      FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_speed.imageset/fb_icon_speed@2x.png
  78. BIN
      FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_speed.imageset/fb_icon_speed@3x.png
  79. BIN
      FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_sporttime.imageset/fb_icon_sporttime@2x.png
  80. BIN
      FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_sporttime.imageset/fb_icon_sporttime@3x.png
  81. BIN
      FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_stepNumber.imageset/fb_icon_stepNumber@2x.png
  82. BIN
      FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_stepNumber.imageset/fb_icon_stepNumber@3x.png
  83. BIN
      FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_stride.imageset/fb_icon_stride@2x.png
  84. BIN
      FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_stride.imageset/fb_icon_stride@3x.png
  85. BIN
      FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_swim.imageset/fb_icon_swim@2x.png
  86. BIN
      FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_swim.imageset/fb_icon_swim@3x.png
  87. BIN
      FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_tennis.imageset/fb_icon_tennis@2x.png
  88. BIN
      FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_tennis.imageset/fb_icon_tennis@3x.png
  89. BIN
      FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_volleyball.imageset/fb_icon_volleyball@2x.png
  90. BIN
      FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_volleyball.imageset/fb_icon_volleyball@3x.png
  91. BIN
      FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_walk.imageset/fb_icon_walk@2x.png
  92. BIN
      FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_walk.imageset/fb_icon_walk@3x.png
  93. BIN
      FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_yoga.imageset/fb_icon_yoga@2x.png
  94. BIN
      FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_yoga.imageset/fb_icon_yoga@3x.png
  95. BIN
      FireBoltt/Resource/Assets.xcassets/SportImg/fb_sport_default.imageset/fb_sport_default@2x.png
  96. BIN
      FireBoltt/Resource/Assets.xcassets/SportImg/fb_sport_default.imageset/fb_sport_default@3x.png
  97. 21
      FireBoltt/Resource/Assets.xcassets/SportImg/rb_icon_Step count.imageset/Contents.json
  98. BIN
      FireBoltt/Resource/Assets.xcassets/SportImg/rb_icon_Step count.imageset/rb_icon_Step count@3x.png
  99. 1
      FireBoltt/Resource/Info.plist
  100. 2
      FireBoltt/Resource/ar.lproj/Localizable.strings
  101. Some files were not shown because too many files have changed in this diff Show More

BIN
FireBoltt.xcworkspace/xcuserdata/ecell.xcuserdatad/UserInterfaceState.xcuserstate generated

Binary file not shown.

16
FireBoltt.xcworkspace/xcuserdata/ecell.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@ -127,21 +127,5 @@ @@ -127,21 +127,5 @@
</Locations>
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "0F0451D5-6F0D-4617-8E19-BA98338D2957"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "FireBoltt/FB_Modules/FB_My/Controller/MineViewController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "54"
endingLineNumber = "54"
landmarkName = "makeUI()"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
</Breakpoints>
</Bucket>

2
FireBoltt/Const/MultiLanguageKey.swift

@ -230,7 +230,7 @@ struct MultiLanguageKey_FB { @@ -230,7 +230,7 @@ struct MultiLanguageKey_FB {
static let checkIntervalFB = "测量间隔(分钟)"
static let weChatPayCodeFB = "微信"
static let weChatPayCodeGFB = "微信个人收款码"
static let aliPayCodeFB = "支付宝"
// static let aliPayCodeFB = ""
static let payPalCodeFB = "Paypal"
static let selectNoPhoneFB = "请选择电话号码"
static let paymentCodeFB = "收款码:"

4
FireBoltt/FB_Modules/FB_Bluetooth/BLEBaseBlFireBoltt.h

@ -45,7 +45,7 @@ @@ -45,7 +45,7 @@
@param cmd
@param payType 1:23Paypal收款码4.
@param payType 1:zfb收款23Paypal收款码4.
@param qrCodeImg
*/
- (void)qrCodePushWithBleCmdTypeFB:(BleCMD_FireBoltt )cmd
@ -489,7 +489,7 @@ @@ -489,7 +489,7 @@
@param cmd
@param codeType 0 1
@param codeType 0zfb 1
@param codeData
@param isClear
*/

2
FireBoltt/FB_Modules/FB_Bluetooth/BLEBaseBlFireBoltt.m

@ -121,7 +121,7 @@ @@ -121,7 +121,7 @@
二维码推送
@param cmd 命令类型
@param payType 收款码类型 1:支付宝收款码2:微信收款码,3Paypal收款码4.个人微信码
@param payType 收款码类型 1:zfb收款码2:微信收款码,3Paypal收款码4.个人微信码
@param qrCodeImg 二维码字符串
*/
- (void)qrCodePushWithBleCmdTypeFB:(BleCMD_FireBoltt )cmd

16
FireBoltt/FB_Modules/FB_Device/Controller/PaymentCodeViewControllers.swift

@ -11,13 +11,17 @@ import AVFoundation @@ -11,13 +11,17 @@ import AVFoundation
class PaymentCodeViewControllers: ViewController {
var payArr:[String] = [MultiLanguageKey_FB.aliPayCodeFB.localized,
MultiLanguageKey_FB.weChatPayCodeFB.localized,
// var payArr:[String] = [MultiLanguageKey_FB.aliPayCodeFB.localized,
// MultiLanguageKey_FB.weChatPayCodeFB.localized,
// MultiLanguageKey_FB.payPalCodeFB.localized]
// var imgArr:[String] = ["fb_aliPayCode_cell_icon",
// "fb_icon_wechat",
// "fb_paypalCode_cell_icon"]
var payArr:[String] = [MultiLanguageKey_FB.weChatPayCodeFB.localized,
MultiLanguageKey_FB.payPalCodeFB.localized]
var imgArr:[String] = ["fb_aliPayCode_cell_icon",
"fb_icon_wechat",
"fb_paypalCode_cell_icon",
]
var imgArr:[String] = ["fb_icon_wechat",
"fb_paypalCode_cell_icon"]
var tableView:UITableView?
override func loadView() {

20
FireBoltt/FB_Modules/FB_My/Controller/MineViewController.swift

@ -16,6 +16,7 @@ class MineViewController: TableViewController { @@ -16,6 +16,7 @@ class MineViewController: TableViewController {
lazy var headerView: MineHeaderView = {
let view = MineHeaderView(frame: CGRect(x: 0, y: 0, width: kScreenW, height: kScaleWidth(180)+10))
view.bgView.addTarget(self, action: #selector(pusInfo), for: .touchUpInside)
return view
}()
@ -48,16 +49,21 @@ class MineViewController: TableViewController { @@ -48,16 +49,21 @@ class MineViewController: TableViewController {
//
tableView.tableHeaderView = headerView
tableView.isScrollEnabled = false
headerView.rx.tap
.subscribe(onNext: { [weak self] _ in
guard let `self` = self else { return }
let vm = UserInfoViewModel()
self.navigator.show(segue: .userInfo(viewModel: vm), sender: self)
})
.disposed(by: rx.disposeBag)
// headerView.rx.tap
// .subscribe(onNext: { [weak self] _ in
// guard let `self` = self else { return }
// let vm = UserInfoViewModel()
// self.navigator.show(segue: .userInfo(viewModel: vm), sender: self)
// })
// .disposed(by: rx.disposeBag)
layoutUI()
}
@objc func pusInfo(){
let vm = UserInfoViewModel()
self.navigator.show(segue: .userInfo(viewModel: vm), sender: self)
}
func layoutUI() {
tableView.snp.makeConstraints { (make) in
make.edges.equalToSuperview()

11
FireBoltt/FB_Modules/FB_My/MineHeaderView.swift

@ -35,10 +35,13 @@ class MineHeaderView: UIButton { @@ -35,10 +35,13 @@ class MineHeaderView: UIButton {
return img
}()
lazy var bgView: UIView = {
let view = UIView()
view.gradient(colors: [kHexColor(0x59AAFF), kHexColor(0x2B75FF)], locations: nil, autoLaoutFrame: CGRect(x: 0, y: 0, width: kScreenW, height: kScaleWidth(180)))
return view
lazy var bgView: UIButton = {
let btn = UIButton(type: .custom).then {
$0.setTitleColor(.white, for: .normal)
}
btn.gradient(colors: [kHexColor(0x59AAFF), kHexColor(0x2B75FF)], startPoint: CGPoint(x: 0, y: 0.5), endPoint: CGPoint(x: 1, y: 0.5), locations: [0, 1], autoLaoutFrame: CGRect(x: 0, y: 0, width: kScreenW, height: kScaleWidth(180)))
return btn
}()
override init(frame: CGRect) {

BIN
FireBoltt/Resource/Assets.xcassets/DeviceImg/fb_default_device_icon.imageset/缺省图-未绑定设备@2x.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 24 KiB

After

Width:  |  Height:  |  Size: 37 KiB

BIN
FireBoltt/Resource/Assets.xcassets/DeviceImg/fb_default_device_icon.imageset/缺省图-未绑定设备@3x.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 46 KiB

After

Width:  |  Height:  |  Size: 84 KiB

BIN
FireBoltt/Resource/Assets.xcassets/DeviceImg/fb_icon_device.imageset/icon_手环默认图@2x.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
FireBoltt/Resource/Assets.xcassets/DeviceImg/fb_icon_device.imageset/icon_手环默认图@3x.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.4 KiB

After

Width:  |  Height:  |  Size: 2.0 KiB

BIN
FireBoltt/Resource/Assets.xcassets/DeviceImg/fb_icon_tick.imageset/icon_tick@2x.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 733 B

After

Width:  |  Height:  |  Size: 649 B

BIN
FireBoltt/Resource/Assets.xcassets/DeviceImg/fb_icon_tick.imageset/icon_tick@3x.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
FireBoltt/Resource/Assets.xcassets/DeviceImg/fb_icon_watch_connect.imageset/icon_watch_connect@2x.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
FireBoltt/Resource/Assets.xcassets/DeviceImg/fb_icon_watch_connect.imageset/icon_watch_connect@3x.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.2 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

BIN
FireBoltt/Resource/Assets.xcassets/DeviceImg/fb_icon_watch_not connect.imageset/icon_watch_not connect@2x.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 919 B

After

Width:  |  Height:  |  Size: 881 B

BIN
FireBoltt/Resource/Assets.xcassets/DeviceImg/fb_icon_watch_not connect.imageset/icon_watch_not connect@3x.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

BIN
FireBoltt/Resource/Assets.xcassets/DeviceImg/fb_power_charge_icon.imageset/power_charge@2x.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 737 B

After

Width:  |  Height:  |  Size: 488 B

BIN
FireBoltt/Resource/Assets.xcassets/DeviceImg/fb_power_charge_icon.imageset/power_charge@3x.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.0 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
FireBoltt/Resource/Assets.xcassets/DeviceImg/fb_scanDevice_default_icon.imageset/缺省图-未搜索到设备@2x.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 22 KiB

After

Width:  |  Height:  |  Size: 40 KiB

BIN
FireBoltt/Resource/Assets.xcassets/DeviceImg/fb_scanDevice_default_icon.imageset/缺省图-未搜索到设备@3x.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 42 KiB

After

Width:  |  Height:  |  Size: 83 KiB

BIN
FireBoltt/Resource/Assets.xcassets/DeviceImg/fb_update_icon.imageset/缺省图-升级设备@2x.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 81 KiB

After

Width:  |  Height:  |  Size: 41 KiB

BIN
FireBoltt/Resource/Assets.xcassets/DeviceImg/fb_update_icon.imageset/缺省图-升级设备@3x.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 166 KiB

After

Width:  |  Height:  |  Size: 80 KiB

BIN
FireBoltt/Resource/Assets.xcassets/DeviceImg/power_0.imageset/power_0@2x.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 396 B

After

Width:  |  Height:  |  Size: 268 B

BIN
FireBoltt/Resource/Assets.xcassets/DeviceImg/power_0.imageset/power_0@3x.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 590 B

After

Width:  |  Height:  |  Size: 425 B

BIN
FireBoltt/Resource/Assets.xcassets/DeviceImg/power_1.imageset/power_1@2x.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 416 B

After

Width:  |  Height:  |  Size: 277 B

BIN
FireBoltt/Resource/Assets.xcassets/DeviceImg/power_1.imageset/power_1@3x.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 660 B

After

Width:  |  Height:  |  Size: 480 B

BIN
FireBoltt/Resource/Assets.xcassets/DeviceImg/power_2.imageset/power_2@2x.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 421 B

After

Width:  |  Height:  |  Size: 276 B

BIN
FireBoltt/Resource/Assets.xcassets/DeviceImg/power_2.imageset/power_2@3x.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 641 B

After

Width:  |  Height:  |  Size: 487 B

BIN
FireBoltt/Resource/Assets.xcassets/DeviceImg/power_3.imageset/power_3@2x.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 420 B

After

Width:  |  Height:  |  Size: 275 B

BIN
FireBoltt/Resource/Assets.xcassets/DeviceImg/power_3.imageset/power_3@3x.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 653 B

After

Width:  |  Height:  |  Size: 486 B

BIN
FireBoltt/Resource/Assets.xcassets/DeviceImg/power_4.imageset/power_4@2x.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 414 B

After

Width:  |  Height:  |  Size: 273 B

BIN
FireBoltt/Resource/Assets.xcassets/DeviceImg/power_4.imageset/power_4@3x.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 637 B

After

Width:  |  Height:  |  Size: 446 B

BIN
FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_badminton.imageset/fb_icon_badminton@2x.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_badminton.imageset/fb_icon_badminton@3x.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.2 KiB

After

Width:  |  Height:  |  Size: 2.9 KiB

BIN
FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_basketball.imageset/fb_icon_basketball@2x.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

BIN
FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_basketball.imageset/fb_icon_basketball@3x.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.9 KiB

After

Width:  |  Height:  |  Size: 3.6 KiB

BIN
FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_bike.imageset/fb_icon_bike@2x.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

BIN
FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_bike.imageset/fb_icon_bike@3x.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.8 KiB

After

Width:  |  Height:  |  Size: 2.9 KiB

BIN
FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_bm.imageset/fb_icon_bm@2x.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

BIN
FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_bm.imageset/fb_icon_bm@3x.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.5 KiB

After

Width:  |  Height:  |  Size: 3.3 KiB

BIN
FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_cadence.imageset/fb_icon_cadence@2x.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.2 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

BIN
FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_cadence.imageset/fb_icon_cadence@3x.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.2 KiB

After

Width:  |  Height:  |  Size: 3.6 KiB

BIN
FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_calories.imageset/icon_Calories@2x.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.2 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

BIN
FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_calories.imageset/icon_Calories@3x.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.4 KiB

After

Width:  |  Height:  |  Size: 3.8 KiB

BIN
FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_climb.imageset/fb_icon_climb@2x.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 2.3 KiB

BIN
FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_climb.imageset/fb_icon_climb@3x.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.8 KiB

After

Width:  |  Height:  |  Size: 3.5 KiB

BIN
FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_date.imageset/icon_date@2x.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 528 B

After

Width:  |  Height:  |  Size: 567 B

BIN
FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_date.imageset/icon_date@3x.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 937 B

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_football.imageset/fb_icon_football@2x.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.8 KiB

BIN
FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_football.imageset/fb_icon_football@3x.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.9 KiB

After

Width:  |  Height:  |  Size: 3.6 KiB

BIN
FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_free.imageset/fb_icon_free@2x.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 706 B

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_free.imageset/fb_icon_free@3x.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 2.0 KiB

BIN
FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_gym.imageset/fb_icon_gym@2x.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 803 B

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_gym.imageset/fb_icon_gym@3x.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 2.4 KiB

BIN
FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_heartRate.imageset/icon_heartRate@2x.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.8 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

BIN
FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_heartRate.imageset/icon_heartRate@3x.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.2 KiB

After

Width:  |  Height:  |  Size: 3.0 KiB

BIN
FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_indoor_cycling.imageset/fb_icon_indoor_cycling@2x.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

BIN
FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_indoor_cycling.imageset/fb_icon_indoor_cycling@3x.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.5 KiB

After

Width:  |  Height:  |  Size: 3.1 KiB

BIN
FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_indoor_walking.imageset/fb_icon_indoor_walking@2x.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_indoor_walking.imageset/fb_icon_indoor_walking@3x.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 2.9 KiB

BIN
FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_pace.imageset/icon_Average pace@2x.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.6 KiB

After

Width:  |  Height:  |  Size: 2.0 KiB

BIN
FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_pace.imageset/icon_Average pace@3x.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.8 KiB

After

Width:  |  Height:  |  Size: 4.7 KiB

BIN
FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_pingpong.imageset/fb_icon_pingpong@2x.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_pingpong.imageset/fb_icon_pingpong@3x.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 2.8 KiB

BIN
FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_run.imageset/fb_icon_run@2x.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 2.0 KiB

BIN
FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_run.imageset/fb_icon_run@3x.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.5 KiB

After

Width:  |  Height:  |  Size: 2.6 KiB

BIN
FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_runindoor.imageset/fb_icon_runindoor@2x.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.8 KiB

BIN
FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_runindoor.imageset/fb_icon_runindoor@3x.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.7 KiB

After

Width:  |  Height:  |  Size: 2.6 KiB

BIN
FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_sex.imageset/fb_icon_sex@2x.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_sex.imageset/fb_icon_sex@3x.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 2.7 KiB

BIN
FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_skating.imageset/fb_icon_skating@2x.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_skating.imageset/fb_icon_skating@3x.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 2.7 KiB

BIN
FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_skipping.imageset/fb_icon_skipping@2x.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

BIN
FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_skipping.imageset/fb_icon_skipping@3x.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.2 KiB

After

Width:  |  Height:  |  Size: 3.4 KiB

BIN
FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_speed.imageset/fb_icon_speed@2x.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.0 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

BIN
FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_speed.imageset/fb_icon_speed@3x.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.5 KiB

After

Width:  |  Height:  |  Size: 3.7 KiB

BIN
FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_sporttime.imageset/fb_icon_sporttime@2x.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.5 KiB

After

Width:  |  Height:  |  Size: 2.4 KiB

BIN
FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_sporttime.imageset/fb_icon_sporttime@3x.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.6 KiB

After

Width:  |  Height:  |  Size: 5.5 KiB

BIN
FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_stepNumber.imageset/fb_icon_stepNumber@2x.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.6 KiB

After

Width:  |  Height:  |  Size: 1.8 KiB

BIN
FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_stepNumber.imageset/fb_icon_stepNumber@3x.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.9 KiB

After

Width:  |  Height:  |  Size: 6.1 KiB

BIN
FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_stride.imageset/fb_icon_stride@2x.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.4 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

BIN
FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_stride.imageset/fb_icon_stride@3x.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.5 KiB

After

Width:  |  Height:  |  Size: 5.4 KiB

BIN
FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_swim.imageset/fb_icon_swim@2x.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.8 KiB

BIN
FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_swim.imageset/fb_icon_swim@3x.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.4 KiB

After

Width:  |  Height:  |  Size: 2.4 KiB

BIN
FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_tennis.imageset/fb_icon_tennis@2x.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

BIN
FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_tennis.imageset/fb_icon_tennis@3x.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.4 KiB

After

Width:  |  Height:  |  Size: 3.0 KiB

BIN
FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_volleyball.imageset/fb_icon_volleyball@2x.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

BIN
FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_volleyball.imageset/fb_icon_volleyball@3x.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.0 KiB

After

Width:  |  Height:  |  Size: 3.3 KiB

BIN
FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_walk.imageset/fb_icon_walk@2x.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

BIN
FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_walk.imageset/fb_icon_walk@3x.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.9 KiB

After

Width:  |  Height:  |  Size: 2.6 KiB

BIN
FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_yoga.imageset/fb_icon_yoga@2x.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

BIN
FireBoltt/Resource/Assets.xcassets/SportImg/fb_icon_yoga.imageset/fb_icon_yoga@3x.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.2 KiB

After

Width:  |  Height:  |  Size: 2.8 KiB

BIN
FireBoltt/Resource/Assets.xcassets/SportImg/fb_sport_default.imageset/fb_sport_default@2x.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 18 KiB

After

Width:  |  Height:  |  Size: 9.7 KiB

BIN
FireBoltt/Resource/Assets.xcassets/SportImg/fb_sport_default.imageset/fb_sport_default@3x.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 35 KiB

After

Width:  |  Height:  |  Size: 21 KiB

21
FireBoltt/Resource/Assets.xcassets/SportImg/rb_icon_Step count.imageset/Contents.json vendored

@ -1,21 +0,0 @@ @@ -1,21 +0,0 @@
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "rb_icon_Step count@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}

BIN
FireBoltt/Resource/Assets.xcassets/SportImg/rb_icon_Step count.imageset/rb_icon_Step count@3x.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.9 KiB

1
FireBoltt/Resource/Info.plist

@ -47,7 +47,6 @@ @@ -47,7 +47,6 @@
<string>开启后,FireBoltt才能获取相册的照片</string>
<key>UIBackgroundModes</key>
<array>
<string>audio</string>
<string>bluetooth-central</string>
<string>bluetooth-peripheral</string>
</array>

2
FireBoltt/Resource/ar.lproj/Localizable.strings

@ -206,6 +206,6 @@ @@ -206,6 +206,6 @@
"名片" = "بطاقة";
"钱包" = "المحفظة";
"收款" = "جرى تحصيلها";
"支付宝" = "ادفع ثمن";
//"支付宝" = "ادفع ثمن";
"隐私政策" = "سياسة الخصوصية";
"用户协议" = "بروتوكول المستخدم";

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save