@@ -37,33 +37,36 @@ class AuxBatteryViewController: CanZeViewController {
3737 var line1 : LineChartDataSet !
3838 var line2 : LineChartDataSet !
3939
40- let aux_Status = Globals . localizableFromPlist ? . value ( forKey : " list_AuxStatus " ) as? [ String ]
41- let vehicle_Status = Globals . localizableFromPlist ? . value ( forKey : Utils . isPh2 ( ) ? " list_VehicleStatePh2 " : " list_VehicleState " ) as? [ String ]
40+ var aux_Status : [ String ] = [ ]
41+ var vehicle_Status : [ String ] = [ ]
4242
4343 override func viewDidLoad( ) {
4444 super. viewDidLoad ( )
4545
4646 // Do any additional setup after loading the view.
4747
48- title = NSLocalizedString ( " title_activity_auxbatt " , comment: " " )
48+ title = NSLocalizedString_ ( " title_activity_auxbatt " , comment: " " )
4949 lblDebug. text = " "
5050 NotificationCenter . default. addObserver ( self , selector: #selector( updateDebugLabel ( notification: ) ) , name: Notification . Name ( " updateDebugLabel " ) , object: nil )
5151
5252 ///
5353
54- label_12V. text = NSLocalizedString ( " label_12V " , comment: " " )
54+ aux_Status = localizableFromPlist ( " list_AuxStatus " )
55+ vehicle_Status = localizableFromPlist ( Utils . isPh2 ( ) ? " list_VehicleStatePh2 " : " list_VehicleState " )
56+
57+ label_12V. text = NSLocalizedString_ ( " label_12V " , comment: " " )
5558 text12V. text = " - "
56- label_12A. text = NSLocalizedString ( " label_12A " , comment: " " )
59+ label_12A. text = NSLocalizedString_ ( " label_12A " , comment: " " )
5760 text12A. text = " - "
58- label_DcLoad. text = NSLocalizedString ( " label_DcLoad " , comment: " " )
61+ label_DcLoad. text = NSLocalizedString_ ( " label_DcLoad " , comment: " " )
5962 textDcLoad. text = " - "
60- label_vehiclestate. text = NSLocalizedString ( " label_vehiclestate " , comment: " " )
63+ label_vehiclestate. text = NSLocalizedString_ ( " label_vehiclestate " , comment: " " )
6164 text_vehicle_state. text = " - "
62- label_VoltageUnderLoad. text = NSLocalizedString ( " label_VoltageLoad " , comment: " " )
65+ label_VoltageUnderLoad. text = NSLocalizedString_ ( " label_VoltageLoad " , comment: " " )
6366 textVoltageUnderLoad. text = " - "
64- label_CurrentUnderLoad. text = NSLocalizedString ( " label_CurrentUnderLoad " , comment: " " )
67+ label_CurrentUnderLoad. text = NSLocalizedString_ ( " label_CurrentUnderLoad " , comment: " " )
6568 textCurrentUnderLoad. text = " - "
66- label_AuxStatus. text = NSLocalizedString ( " label_AuxStatus " , comment: " " )
69+ label_AuxStatus. text = NSLocalizedString_ ( " label_AuxStatus " , comment: " " )
6770 textAuxStatus. text = " - "
6871
6972 lblGraphTitle. text = " _Voltage, Vehicle state "
@@ -100,17 +103,17 @@ class AuxBatteryViewController: CanZeViewController {
100103 }
101104
102105 @objc func updateDebugLabel( notification: Notification ) {
103- let dic = notification. object as? [ String : String ]
104- DispatchQueue . main. async {
105- self . lblDebug. text = dic ? [ " debug " ]
106+ let notificationObject = notification. object as? [ String : String ]
107+ DispatchQueue . main. async { [ self ] in
108+ lblDebug. text = notificationObject ? [ " debug " ]
106109 }
107- debug ( ( dic ? [ " debug " ] ) !)
110+ debug ( ( notificationObject ? [ " debug " ] ) !)
108111 }
109112
110113 override func startQueue( ) {
111114 if !Globals. shared. deviceIsConnected || !Globals. shared. deviceIsInitialized {
112- DispatchQueue . main. async {
113- self . view. makeToast ( " _device not connected " )
115+ DispatchQueue . main. async { [ self ] in
116+ view. makeToast ( " _device not connected " )
114117 }
115118 return
116119 }
@@ -130,8 +133,8 @@ class AuxBatteryViewController: CanZeViewController {
130133 }
131134
132135 @objc func endQueue2( ) {
133- DispatchQueue . main. asyncAfter ( deadline: . now( ) + 0.25 ) {
134- self . startQueue ( )
136+ DispatchQueue . main. asyncAfter ( deadline: . now( ) + 0.25 ) { [ self ] in
137+ startQueue ( )
135138 }
136139 }
137140
@@ -141,33 +144,33 @@ class AuxBatteryViewController: CanZeViewController {
141144
142145 let val = Globals . shared. fieldResultsDouble [ sid!]
143146 if val != nil && !val!. isNaN {
144- DispatchQueue . main. async {
147+ DispatchQueue . main. async { [ self ] in
145148 switch sid {
146149 case Sid . Aux12V:
147- self . text12V. text = String ( format: " %.1f " , val!)
148- self . lblVoltage. text = String ( format: " %.2f " , val!)
149- self . chartEntries1. append ( ChartDataEntry ( x: Date ( ) . timeIntervalSince1970, y: val!) )
150- self . updateChart ( )
150+ text12V. text = String ( format: " %.1f " , val!)
151+ lblVoltage. text = String ( format: " %.2f " , val!)
152+ chartEntries1. append ( ChartDataEntry ( x: Date ( ) . timeIntervalSince1970, y: val!) )
153+ updateChart ( )
151154 case Sid . Aux12A:
152- self . text12A. text = String ( format: " %.1f " , val!)
155+ text12A. text = String ( format: " %.1f " , val!)
153156 case Sid . DcLoad:
154- self . textDcLoad. text = String ( format: " %.1f " , val!)
157+ textDcLoad. text = String ( format: " %.1f " , val!)
155158 case Sid . AuxStatus:
156159 let i = Int ( val!)
157- if i >= 0 , i < self . aux_Status! . count {
158- self . textAuxStatus. text = self . aux_Status! [ i]
160+ if i >= 0 , i < aux_Status. count {
161+ textAuxStatus. text = aux_Status [ i]
159162 }
160163 case Sid . VehicleState:
161164 let i = Int ( val!)
162- if i >= 0 , i < self . vehicle_Status! . count {
163- self . text_vehicle_state. text = self . vehicle_Status! [ i]
164- self . chartEntries2. append ( ChartDataEntry ( x: Date ( ) . timeIntervalSince1970, y: Double ( i) ) )
165- self . updateChart ( )
165+ if i >= 0 , i < vehicle_Status. count {
166+ text_vehicle_state. text = vehicle_Status [ i]
167+ chartEntries2. append ( ChartDataEntry ( x: Date ( ) . timeIntervalSince1970, y: Double ( i) ) )
168+ updateChart ( )
166169 }
167170 case Sid . VoltageUnderLoad:
168- self . textVoltageUnderLoad. text = String ( format: " %.1f " , val!)
171+ textVoltageUnderLoad. text = String ( format: " %.1f " , val!)
169172 case Sid . CurrentUnderLoad:
170- self . textCurrentUnderLoad. text = String ( format: " %.1f " , val!)
173+ textCurrentUnderLoad. text = String ( format: " %.1f " , val!)
171174 default :
172175 print ( " unknown sid \( sid!) " )
173176 }
0 commit comments