@ledvance/base 1.2.25 → 1.2.27

package/package.json

@@ -4,7 +4,7 @@
   "name": "@ledvance/base",
   "pid": [],
   "uiid": "",
-  "version": "1.2.25",
+  "version": "1.2.27",
   "scripts": {},
   "dependencies": {
     "@reduxjs/toolkit": "^1.8.6",

package/src/components/ApplyForDeviceItem.tsx

@@ -3,6 +3,7 @@ import React from 'react'
 import { Utils } from 'tuya-panel-kit'
 import { DeviceInfo } from '../api/native'
 import Spacer from './Spacer'
+import res from '../res'
 
 const cx = Utils.RatioUtils.convertX
 
@@ -13,16 +14,21 @@ export interface ApplyForDeviceItemProps {
 const ApplyForDeviceItem = (props: ApplyForDeviceItemProps) => {
   return (
     <View style={styles.root}>
-      <View style={styles.deviceInfo}>
-        <Image style={styles.deviceIcon} source={{ uri: props.deviceInfo.deviceIcon }}/>
-        <Text style={styles.deviceName}>{props.deviceInfo.deviceName}</Text>
-      </View>
-      <View style={styles.deviceRoomInfo}>
-        <View style={styles.roomNameTag}>
-          <Text style={styles.roomName}>{props.deviceInfo.roomName}</Text>
+      <View style={{ flex: 1 }}>
+        <View style={styles.deviceInfo}>
+          <Image style={styles.deviceIcon} source={{ uri: props.deviceInfo.deviceIcon }} />
+          <Text style={styles.deviceName}>{props.deviceInfo.deviceName}</Text>
+        </View>
+        <View style={styles.deviceRoomInfo}>
+          <View style={styles.roomNameTag}>
+            <Text style={styles.roomName}>{props.deviceInfo.roomName}</Text>
+          </View>
         </View>
+        <Spacer height={cx(6)} />
+      </View>
+      <View style={[styles.offlineIcon, {marginRight: cx(5)}]}>
+        {!props.deviceInfo.status && <Image style={styles.offlineIcon} source={res.offline_wifi} />}
       </View>
-      <Spacer height={cx(6)}/>
     </View>
   )
 }
@@ -31,6 +37,8 @@ const styles = StyleSheet.create({
   root: {
     marginHorizontal: cx(8),
     backgroundColor: '#fff',
+    flexDirection: 'row',
+    alignItems: 'center'
   },
   deviceInfo: {
     flex: 1,
@@ -67,6 +75,10 @@ const styles = StyleSheet.create({
     fontSize: cx(10),
     fontFamily: 'helvetica_neue_lt_std_roman',
   },
+  offlineIcon: {
+    width: cx(24),
+    height: cx(24)
+  }
 })
 
 export default ApplyForDeviceItem

package/src/i18n/strings.ts

@@ -547,7 +547,9 @@ export default {
       striplight_adaptbutton: "Adaptar", 
       striplight_lengthtitle: "Longitud de la tira de luz", 
       striplight_actuallength: "Longitud real", 
-      add_sleepschedule_one_source_subheadline4_text: "Resumen"
+      add_sleepschedule_one_source_subheadline4_text: "Resumen", 
+      manage_user_calendar_label_am: "AM", 
+      manage_user_calendar_label_pm: "PM"
   }, 
   ar: {
       add_new_dynamic_mood_color_changing_mode_value: "التدرج", 
@@ -1097,7 +1099,9 @@ export default {
       striplight_adaptbutton: "تكيف", 
       striplight_lengthtitle: "طول شريط الضوء", 
       striplight_actuallength: "الطول الفعلي", 
-      add_sleepschedule_one_source_subheadline4_text: "ملخص"
+      add_sleepschedule_one_source_subheadline4_text: "ملخص", 
+      manage_user_calendar_label_am: "صباحًا", 
+      manage_user_calendar_label_pm: "مساء"
   }, 
   cs: {
       add_new_dynamic_mood_color_changing_mode_value: "Gradient", 
@@ -1647,7 +1651,9 @@ export default {
       striplight_adaptbutton: "Přizpůsobit", 
       striplight_lengthtitle: "Délka světelného pásu", 
       striplight_actuallength: "Skutečná délka", 
-      add_sleepschedule_one_source_subheadline4_text: "SHRNUTÍ"
+      add_sleepschedule_one_source_subheadline4_text: "SHRNUTÍ", 
+      manage_user_calendar_label_am: "dopoledne", 
+      manage_user_calendar_label_pm: "odpoledne"
   }, 
   en: {
       add_new_dynamic_mood_color_changing_mode_value: "Gradient", 
@@ -2197,7 +2203,9 @@ export default {
       striplight_adaptbutton: "Adapt", 
       striplight_lengthtitle: "Strip Light length", 
       striplight_actuallength: "Actual length", 
-      add_sleepschedule_one_source_subheadline4_text: "SUMMARY"
+      add_sleepschedule_one_source_subheadline4_text: "SUMMARY", 
+      manage_user_calendar_label_am: "AM", 
+      manage_user_calendar_label_pm: "PM"
   }, 
   bg: {
       add_new_dynamic_mood_color_changing_mode_value: "Градиент", 
@@ -2747,7 +2755,9 @@ export default {
       striplight_adaptbutton: "Адаптиране", 
       striplight_lengthtitle: "Лента Светла дължина", 
       striplight_actuallength: "Действителна дължина", 
-      add_sleepschedule_one_source_subheadline4_text: "ОБОБЩЕНИЕ"
+      add_sleepschedule_one_source_subheadline4_text: "ОБОБЩЕНИЕ", 
+      manage_user_calendar_label_am: "АМ", 
+      manage_user_calendar_label_pm: "PM"
   }, 
   da: {
       add_new_dynamic_mood_color_changing_mode_value: "Gradvist", 
@@ -3297,7 +3307,9 @@ export default {
       striplight_adaptbutton: "Tilpas", 
       striplight_lengthtitle: "Strip Light længde", 
       striplight_actuallength: "Faktisk længde", 
-      add_sleepschedule_one_source_subheadline4_text: "OVERSIGT"
+      add_sleepschedule_one_source_subheadline4_text: "OVERSIGT", 
+      manage_user_calendar_label_am: "Om formiddagen", 
+      manage_user_calendar_label_pm: "om eftermiddagen"
   }, 
   de: {
       add_new_dynamic_mood_color_changing_mode_value: "Fließend", 
@@ -3847,7 +3859,9 @@ export default {
       striplight_adaptbutton: "Anpassen", 
       striplight_lengthtitle: "Länge des Lichtstreifens", 
       striplight_actuallength: "Tatsächliche Länge", 
-      add_sleepschedule_one_source_subheadline4_text: "Zusammenfassung"
+      add_sleepschedule_one_source_subheadline4_text: "Zusammenfassung", 
+      manage_user_calendar_label_am: "vorm.", 
+      manage_user_calendar_label_pm: "nachm."
   }, 
   el: {
       add_new_dynamic_mood_color_changing_mode_value: "Διαβάθμιση", 
@@ -4397,7 +4411,9 @@ export default {
       striplight_adaptbutton: "Προσαρμογή", 
       striplight_lengthtitle: "Μήκος strip Light", 
       striplight_actuallength: "Πραγματικό μήκος", 
-      add_sleepschedule_one_source_subheadline4_text: "ΣΥΝΟΨΗ"
+      add_sleepschedule_one_source_subheadline4_text: "ΣΥΝΟΨΗ", 
+      manage_user_calendar_label_am: "ΠΜ", 
+      manage_user_calendar_label_pm: "ΜΜ"
   }, 
   es: {
       add_new_dynamic_mood_color_changing_mode_value: "Gradiente", 
@@ -4947,7 +4963,9 @@ export default {
       striplight_adaptbutton: "Adaptar", 
       striplight_lengthtitle: "Longitud de la tira de luz", 
       striplight_actuallength: "Longitud real", 
-      add_sleepschedule_one_source_subheadline4_text: "Resumen"
+      add_sleepschedule_one_source_subheadline4_text: "Resumen", 
+      manage_user_calendar_label_am: "AM", 
+      manage_user_calendar_label_pm: "PM"
   }, 
   et: {
       add_new_dynamic_mood_color_changing_mode_value: "Muutmisaste", 
@@ -5497,7 +5515,9 @@ export default {
       striplight_adaptbutton: "Kohaneda", 
       striplight_lengthtitle: "Riba valguse pikkus", 
       striplight_actuallength: "Tegelik pikkus", 
-      add_sleepschedule_one_source_subheadline4_text: "KOKKUVÕTE"
+      add_sleepschedule_one_source_subheadline4_text: "KOKKUVÕTE", 
+      manage_user_calendar_label_am: "enne lõunat", 
+      manage_user_calendar_label_pm: "pärast lõunat"
   }, 
   fi: {
       add_new_dynamic_mood_color_changing_mode_value: "Liukuva", 
@@ -6047,7 +6067,9 @@ export default {
       striplight_adaptbutton: "Sopeutua", 
       striplight_lengthtitle: "Nauhan valon pituus", 
       striplight_actuallength: "Todellinen pituus", 
-      add_sleepschedule_one_source_subheadline4_text: "YHTEENVETO"
+      add_sleepschedule_one_source_subheadline4_text: "YHTEENVETO", 
+      manage_user_calendar_label_am: "AAMUPÄIVÄ", 
+      manage_user_calendar_label_pm: "ILTAPÄIVÄ"
   }, 
   fr: {
       add_new_dynamic_mood_color_changing_mode_value: "Fluide", 
@@ -6597,7 +6619,9 @@ export default {
       striplight_adaptbutton: "Adapter", 
       striplight_lengthtitle: "Longueur de la bande lumineuse", 
       striplight_actuallength: "Longueur réelle", 
-      add_sleepschedule_one_source_subheadline4_text: "Récapitulatif"
+      add_sleepschedule_one_source_subheadline4_text: "Récapitulatif", 
+      manage_user_calendar_label_am: "AM", 
+      manage_user_calendar_label_pm: "PM"
   }, 
   hr: {
       add_new_dynamic_mood_color_changing_mode_value: "Prijelaz", 
@@ -7147,7 +7171,9 @@ export default {
       striplight_adaptbutton: "Prilagoditi", 
       striplight_lengthtitle: "Duljina svjetla trake", 
       striplight_actuallength: "Stvarna duljina", 
-      add_sleepschedule_one_source_subheadline4_text: "SAŽETAK"
+      add_sleepschedule_one_source_subheadline4_text: "SAŽETAK", 
+      manage_user_calendar_label_am: "AM", 
+      manage_user_calendar_label_pm: "PM"
   }, 
   hu: {
       add_new_dynamic_mood_color_changing_mode_value: "Átmenet", 
@@ -7697,7 +7723,9 @@ export default {
       striplight_adaptbutton: "Alkalmazkodás", 
       striplight_lengthtitle: "Szalagfény hossza", 
       striplight_actuallength: "Valós hossz", 
-      add_sleepschedule_one_source_subheadline4_text: "ÖSSZEGZÉS"
+      add_sleepschedule_one_source_subheadline4_text: "ÖSSZEGZÉS", 
+      manage_user_calendar_label_am: "DE.", 
+      manage_user_calendar_label_pm: "DU."
   }, 
   it: {
       add_new_dynamic_mood_color_changing_mode_value: "Fluido", 
@@ -8247,7 +8275,9 @@ export default {
       striplight_adaptbutton: "Adattarsi", 
       striplight_lengthtitle: "Lunghezza della striscia luminosa", 
       striplight_actuallength: "Lunghezza effettiva", 
-      add_sleepschedule_one_source_subheadline4_text: "Riepilogo"
+      add_sleepschedule_one_source_subheadline4_text: "Riepilogo", 
+      manage_user_calendar_label_am: "AM", 
+      manage_user_calendar_label_pm: "PM"
   }, 
   ko: {
       add_new_dynamic_mood_color_changing_mode_value: "그래디언트", 
@@ -8797,7 +8827,9 @@ export default {
       striplight_adaptbutton: "적응", 
       striplight_lengthtitle: "스트립 라이트 길이", 
       striplight_actuallength: "실제 길이", 
-      add_sleepschedule_one_source_subheadline4_text: "개요"
+      add_sleepschedule_one_source_subheadline4_text: "개요", 
+      manage_user_calendar_label_am: "오전", 
+      manage_user_calendar_label_pm: "오후"
   }, 
   lt: {
       add_new_dynamic_mood_color_changing_mode_value: "Gradientas", 
@@ -9347,7 +9379,9 @@ export default {
       striplight_adaptbutton: "Prisitaikyti", 
       striplight_lengthtitle: "Juostelė Šviesos ilgis", 
       striplight_actuallength: "Tikrasis ilgis", 
-      add_sleepschedule_one_source_subheadline4_text: "SANTRAUKA"
+      add_sleepschedule_one_source_subheadline4_text: "SANTRAUKA", 
+      manage_user_calendar_label_am: "Priešpiet", 
+      manage_user_calendar_label_pm: "Popiet"
   }, 
   lv: {
       add_new_dynamic_mood_color_changing_mode_value: "Gradients", 
@@ -9897,7 +9931,9 @@ export default {
       striplight_adaptbutton: "Pielāgot", 
       striplight_lengthtitle: "Sloksne Gaismas garums", 
       striplight_actuallength: "Faktiskais garums", 
-      add_sleepschedule_one_source_subheadline4_text: "KOPSAVILKUMS"
+      add_sleepschedule_one_source_subheadline4_text: "KOPSAVILKUMS", 
+      manage_user_calendar_label_am: "priekšpusdienā", 
+      manage_user_calendar_label_pm: "pēcpusdienā"
   }, 
   nb: {
       add_new_dynamic_mood_color_changing_mode_value: "Gradient", 
@@ -10447,7 +10483,9 @@ export default {
       striplight_adaptbutton: "Tilpass", 
       striplight_lengthtitle: "Stripelys lengde", 
       striplight_actuallength: "Faktisk lengde", 
-      add_sleepschedule_one_source_subheadline4_text: "SAMMENDRAG"
+      add_sleepschedule_one_source_subheadline4_text: "SAMMENDRAG", 
+      manage_user_calendar_label_am: "FM", 
+      manage_user_calendar_label_pm: "EM"
   }, 
   nl: {
       add_new_dynamic_mood_color_changing_mode_value: "Verloop", 
@@ -10997,7 +11035,9 @@ export default {
       striplight_adaptbutton: "Aanpassen", 
       striplight_lengthtitle: "Lengte van de striplamp", 
       striplight_actuallength: "Werkelijke lengte", 
-      add_sleepschedule_one_source_subheadline4_text: "SAMENVATTING"
+      add_sleepschedule_one_source_subheadline4_text: "SAMENVATTING", 
+      manage_user_calendar_label_am: "AM", 
+      manage_user_calendar_label_pm: "PM"
   }, 
   pl: {
       add_new_dynamic_mood_color_changing_mode_value: "Gradient", 
@@ -11547,7 +11587,9 @@ export default {
       striplight_adaptbutton: "Dostosuj", 
       striplight_lengthtitle: "Długość paska światła", 
       striplight_actuallength: "Rzeczywista długość", 
-      add_sleepschedule_one_source_subheadline4_text: "PODSUMOWANIE"
+      add_sleepschedule_one_source_subheadline4_text: "PODSUMOWANIE", 
+      manage_user_calendar_label_am: "Przed południem", 
+      manage_user_calendar_label_pm: "Po południu"
   }, 
   'pt-BR': {
       add_new_dynamic_mood_color_changing_mode_value: "Gradiente", 
@@ -12097,7 +12139,9 @@ export default {
       striplight_adaptbutton: "Adaptar", 
       striplight_lengthtitle: "Comprimento da luz de tira", 
       striplight_actuallength: "Comprimento real", 
-      add_sleepschedule_one_source_subheadline4_text: "Sumário"
+      add_sleepschedule_one_source_subheadline4_text: "Sumário", 
+      manage_user_calendar_label_am: "a.m.", 
+      manage_user_calendar_label_pm: "PM"
   }, 
   'pt_BR': {
     add_new_dynamic_mood_color_changing_mode_value: "Gradiente", 
@@ -12647,7 +12691,9 @@ export default {
     striplight_adaptbutton: "Adaptar", 
     striplight_lengthtitle: "Comprimento da luz de tira", 
     striplight_actuallength: "Comprimento real", 
-    add_sleepschedule_one_source_subheadline4_text: "Sumário"
+    add_sleepschedule_one_source_subheadline4_text: "Sumário", 
+    manage_user_calendar_label_am: "a.m.", 
+    manage_user_calendar_label_pm: "PM"
 }, 
   ro: {
       add_new_dynamic_mood_color_changing_mode_value: "Gradient", 
@@ -13197,7 +13243,9 @@ export default {
       striplight_adaptbutton: "Adaptare", 
       striplight_lengthtitle: "Lungimea luminii benzii", 
       striplight_actuallength: "Lungimea reală", 
-      add_sleepschedule_one_source_subheadline4_text: "Rezumat"
+      add_sleepschedule_one_source_subheadline4_text: "Rezumat", 
+      manage_user_calendar_label_am: "AM", 
+      manage_user_calendar_label_pm: "PM"
   }, 
   ru: {
       add_new_dynamic_mood_color_changing_mode_value: "Градиент", 
@@ -13747,7 +13795,9 @@ export default {
       striplight_adaptbutton: "Адаптировать", 
       striplight_lengthtitle: "Длина полосы света", 
       striplight_actuallength: "Фактическая длина", 
-      add_sleepschedule_one_source_subheadline4_text: "Краткая информация"
+      add_sleepschedule_one_source_subheadline4_text: "Краткая информация", 
+      manage_user_calendar_label_am: "до полудня", 
+      manage_user_calendar_label_pm: "После полудня"
   }, 
   sk: {
       add_new_dynamic_mood_color_changing_mode_value: "Prechod", 
@@ -14297,7 +14347,9 @@ export default {
       striplight_adaptbutton: "Prispôsobiť", 
       striplight_lengthtitle: "Dĺžka pásu svetla", 
       striplight_actuallength: "Skutočná dĺžka", 
-      add_sleepschedule_one_source_subheadline4_text: "ZHRNUTIE"
+      add_sleepschedule_one_source_subheadline4_text: "ZHRNUTIE", 
+      manage_user_calendar_label_am: "Dopoludnie", 
+      manage_user_calendar_label_pm: "Popoludnie"
   }, 
   sv: {
       add_new_dynamic_mood_color_changing_mode_value: "Toning", 
@@ -14847,7 +14899,9 @@ export default {
       striplight_adaptbutton: "Anpassa", 
       striplight_lengthtitle: "Strip Ljuslängd", 
       striplight_actuallength: "Faktisk längd", 
-      add_sleepschedule_one_source_subheadline4_text: "SAMMANFATTNING"
+      add_sleepschedule_one_source_subheadline4_text: "SAMMANFATTNING", 
+      manage_user_calendar_label_am: "FM", 
+      manage_user_calendar_label_pm: "EM"
   }, 
   tr: {
       add_new_dynamic_mood_color_changing_mode_value: "Gradyan", 
@@ -15397,7 +15451,9 @@ export default {
       striplight_adaptbutton: "Uyarlamak", 
       striplight_lengthtitle: "Şerit Işık uzunluğu", 
       striplight_actuallength: "Gerçek uzunluk", 
-      add_sleepschedule_one_source_subheadline4_text: "ÖZET"
+      add_sleepschedule_one_source_subheadline4_text: "ÖZET", 
+      manage_user_calendar_label_am: "ÖÖ", 
+      manage_user_calendar_label_pm: "ÖĞLEDEN SONRA"
   }, 
   uk: {
       add_new_dynamic_mood_color_changing_mode_value: "Градієнт", 
@@ -15947,6 +16003,8 @@ export default {
       striplight_adaptbutton: "Адаптувати", 
       striplight_lengthtitle: "Довжина світлової смуги", 
       striplight_actuallength: "Фактична довжина", 
-      add_sleepschedule_one_source_subheadline4_text: "ПІДСУМОК"
+      add_sleepschedule_one_source_subheadline4_text: "ПІДСУМОК", 
+      manage_user_calendar_label_am: "АМ", 
+      manage_user_calendar_label_pm: "PM"
   }
 }

package/src/res/index.ts

@@ -66,4 +66,5 @@ export default {
   ic_plus: require('./ic_plus.png'),
   ic_disabled_light: require('./ic_disabled_light.png'),
   ic_top_arrow: require('./ic_top_arrow.png'),
+  offline_wifi: require('./offlineWifi.png')
 }

package/src/utils/common.ts

@@ -1,10 +1,10 @@
-import {NativeModules, Platform} from 'react-native'
+import { NativeModules, Platform } from 'react-native'
 import I18n from '../i18n/index'
-import {formatNumber, openDownloadFile} from 'api/native'
+import { formatNumber, openDownloadFile } from 'api/native'
 import dayjs from 'dayjs'
 import RNFetchBlob from 'rn-fetch-blob'
-import {isEqual} from 'lodash'
-import {Dialog} from 'tuya-panel-kit'
+import { isEqual } from 'lodash'
+import { Dialog } from 'tuya-panel-kit'
 
 const loopsText = [
   I18n.getLang('timeschedule_add_schedule_weekday7_text'),
@@ -18,14 +18,14 @@ const loopsText = [
 
 export const loopText = (loop, time = '') => {
   let isToday = true
-  if(time){
+  if (time) {
     const currentTime = dayjs()
     const targetTime = dayjs().set('hour', parseInt(time.split(':')[0])).set('minute', parseInt(time.split(':')[1]));
     const isBeforeCurrentTime = targetTime.isBefore(currentTime)
     isToday = !isBeforeCurrentTime
   }
-    const loopStrArray = loopsText.filter((_item, index) => Number(loop[index]) === 1)
-    return loopStrArray.length === 0 ? (I18n.getLang(isToday ? 'motion_detection_time_schedule_notifications_field_weekdays_text2' : 'motion_detection_time_schedule_notifications_field_weekdays_text3')) : loopStrArray.length === 7 ? I18n.getLang('motion_detection_time_schedule_notifications_field_weekdays_text4') : loopStrArray.join(' ')
+  const loopStrArray = loopsText.filter((_item, index) => Number(loop[index]) === 1)
+  return loopStrArray.length === 0 ? (I18n.getLang(isToday ? 'motion_detection_time_schedule_notifications_field_weekdays_text2' : 'motion_detection_time_schedule_notifications_field_weekdays_text3')) : loopStrArray.length === 7 ? I18n.getLang('motion_detection_time_schedule_notifications_field_weekdays_text4') : loopStrArray.join(' ')
 }
 
 const tommorrow = () => {
@@ -255,7 +255,7 @@ export function showDialog(props: DialogProps) {
         confirmText: showConfirmText && (confirmText || I18n.getLang('conflict_dialog_save_item_fixedtimecycle_answer_yes_text')) || '',
         subTitle,
         onConfirm,
-        motionConfig:{
+        motionConfig: {
           hideDuration: 0,
           showDuration: 100
         }
@@ -266,10 +266,47 @@ export function showDialog(props: DialogProps) {
         confirmText: showConfirmText && (confirmText || I18n.getLang('conflict_dialog_save_item_fixedtimecycle_answer_yes_text')) || '',
         subTitle,
         onConfirm,
-        motionConfig:{
+        motionConfig: {
           hideDuration: 0,
           showDuration: 100
         }
       })
   )
 }
+
+export function convertTo12HourFormat(time24: string) {
+  // 将字符串按照':'分割成小时和分钟
+  var timeParts = time24.split(':');
+  var hours = parseInt(timeParts[0]);
+  var minutes = parseInt(timeParts[1]);
+
+  // 检查小时是否大于等于12
+  var suffix = (hours >= 12) ? I18n.getLang('manage_user_calendar_label_pm') : I18n.getLang('manage_user_calendar_label_am');
+
+  // 如果小时大于12，将小时减去12
+  hours = (hours > 12) ? hours - 12 : hours;
+
+  // 如果小时为0，则表示为12小时制中的12点
+  hours = (hours == 0) ? 12 : hours;
+
+  // 返回转换后的时间字符串
+  return suffix + ' ' + hours + ':' + (minutes < 10 ? '0' : '') + minutes;
+}
+
+// 将分钟数转换为12小时制时间
+export function convertMinutesTo12HourFormat(minutes: number) {
+  var hours = Math.floor(minutes / 60); // 获取小时数
+  var mins = minutes % 60; // 获取剩余分钟数
+
+  // 检查小时数是否大于12，并调整
+  if (hours > 12) {
+    hours -= 12;
+  }
+
+  // 构造12小时制时间字符串
+  var suffix = (hours >= 12) ? I18n.getLang('manage_user_calendar_label_pm') : I18n.getLang('manage_user_calendar_label_am');
+  hours = (hours == 0) ? 12 : hours; // 处理午夜0点为12小时制的12点
+  var time12Hour = suffix + ' ' + hours + ':' + (mins < 10 ? '0' : '') + mins;
+
+  return time12Hour;
+}