@ledvance/base 1.2.62 → 1.2.64

package/localazy.keys.json

@@ -1,4 +1,4 @@
-{
-  "writeKey": "",
-  "readKey": "a7349213573288779040-d092b120e7d6d90c7e9528ddf2aa600659f60631bd4a5c2d55de0aa2b081af1b"
+{
+  "writeKey": "",
+  "readKey": "a7349213573288779040-d092b120e7d6d90c7e9528ddf2aa600659f60631bd4a5c2d55de0aa2b081af1b"
 }

package/package.json

@@ -4,7 +4,10 @@
   "name": "@ledvance/base",
   "pid": [],
   "uiid": "",
-  "version": "1.2.62",
+  "version": "1.2.64",
+  "scripts": {
+    "prepublishOnly": "python update-localazy.py"
+  },
   "dependencies": {
     "@reduxjs/toolkit": "^1.8.6",
     "@tuya/tuya-panel-api": "^1.12.0",

package/src/api/native.ts

@@ -17,6 +17,7 @@ interface LDVDevicePanelManager {
   formatNumber: (num: number, fixed: number, isCN: boolean) => string
   getTimeZone: () => string
   groupControl: (tyGroupId: number, dps: string, config: string) => Promise<NativeResult<any>>
+  groupControlToTuya: (tyGroupId: number, dps: string) => Promise<NativeResult<any>>
   getFeature: (deviceId: string, featureId: string, callback: (res: NativeResult<string>) => void) => void
   putFeature: (deviceId: string, featureId: string, value: any, callback: (res: NativeResult<string>) => void) => void
   getGroupDevices: (tyGroupId: number) => Promise<NativeResult<string>>
@@ -329,6 +330,15 @@ export class NativeApi {
     }
   }
 
+  static async putGroupTYDps(tyGroupId: number, dps: string){
+    const nativeResult = await devicePanel.groupControlToTuya(tyGroupId, dps)
+    return {
+      success: nativeResult.result,
+      msg: nativeResult.msg,
+      data: nativeResult.data,
+    }
+  }
+
 }
 
 // 打开下载文件

package/src/api/nativeEventEmitter.ts

@@ -98,17 +98,15 @@ export const addListener = (store) => {
   })
 
   groupDeviceListener = nativeEventEmitter.addListener('TYInfoUpdate', (event: TYInfoUpdateType) =>{
-    const groupDevices = store.getState().ldvModules.uaGroupInfo.groupDevices
-    const newGroupDevices = cloneDeep(groupDevices).map(device => {
-      if(device.deviceId.indexOf(event.devId) !== -1){
-        return{
-          ...device,
-          status: event.online ? 1 : 0
-        }
+    const groupDevices = cloneDeep(store.getState().ldvModules.uaGroupInfo.groupDevices)
+    const idx = groupDevices.findIndex(device => device?.deviceId?.indexOf(event.devId) !== -1)
+    if(idx !== -1 && Number(groupDevices[idx].status) !== (event.online ? 1 : 0)){
+      groupDevices[idx] = {
+        ...groupDevices[idx],
+        status: event.online ? 1 : 0
       }
-      return device
-    })
-    store.dispatch(setGroupDevices(newGroupDevices))
+      store.dispatch(setGroupDevices(groupDevices))
+    }
   })
 }
 

package/src/components/Summary.tsx

@@ -0,0 +1,124 @@
+import React, { ReactElement, memo } from "react";
+import { Text, Image, ViewStyle, View, StyleSheet } from 'react-native'
+import res from "@ledvance/base/src/res"
+import I18n from "@ledvance/base/src/i18n";
+import { Utils } from "tuya-panel-kit";
+import Spacer from "@ledvance/base/src/components/Spacer";
+
+const { convertX: cx } = Utils.RatioUtils;
+
+interface SummaryProps {
+  style?: ViewStyle
+  frequency?: string | ReactElement
+  time?: string | ReactElement
+  actions?: ReactElement
+  hideActions?: boolean
+}
+
+const Summary = (props: SummaryProps) => {
+  return (
+    <View style={styles.cardContainer}>
+      <Text style={styles.itemTitle}>{I18n.getLang('add_randomtimecycle_subheadline_text')}</Text>
+      <Spacer height={cx(10)} />
+      <View style={{}}>
+        <View style={styles.summaryContainer}>
+          <View style={styles.summaryLeft}>
+            <Image
+              source={res.summary_icon1}
+              resizeMode="contain"
+              style={styles.summaryImg}
+            />
+            <View>
+              <Text style={styles.leftTitle}>{I18n.getLang('feature_summary_frequency_headline')}</Text>
+            </View>
+          </View>
+          <View style={styles.summaryRight}>
+            <View style={styles.rightWrap}>
+              <Text style={styles.rightItem}>{props.frequency}</Text>
+            </View>
+          </View>
+        </View>
+        <View style={styles.summaryContainer}>
+          <View style={styles.summaryLeft}>
+            <Image
+              source={res.summary_icon2}
+              resizeMode="contain"
+              style={styles.summaryImg}
+            />
+            <View>
+              <Text style={styles.leftTitle}>{I18n.getLang('feature_summary_time_headline')}</Text>
+            </View>
+          </View>
+          <View style={styles.summaryRight}>
+            <View style={styles.rightWrap}>
+              <Text style={styles.rightItem}>{props.time}</Text>
+            </View>
+          </View>
+        </View>
+        {!props.hideActions && <View style={[styles.summaryContainer, { alignItems: 'flex-start' }]}>
+          <View style={styles.summaryLeft}>
+            <Image
+              source={res.summary_icon3}
+              resizeMode="contain"
+              style={styles.summaryImg}
+            />
+            <View>
+              <Text style={styles.leftTitle}>{I18n.getLang('motion_detection_add_time_schedule_actions_text1')}</Text>
+            </View>
+          </View>
+          <View style={styles.summaryRight}>
+            {props.actions}
+          </View>
+        </View>}
+      </View>
+    </View>
+  )
+}
+
+const styles = StyleSheet.create({
+  cardContainer: {
+    marginHorizontal: cx(24),
+  },
+  itemTitle: {
+    color: '#000',
+    fontSize: cx(16),
+    fontWeight: 'bold',
+    fontFamily: 'helvetica_neue_lt_std_bd',
+  },
+  summaryContainer: {
+    flex: 1,
+    flexDirection: 'row',
+    marginBottom: cx(10),
+  },
+  summaryLeft: {
+    flexDirection: 'row',
+    alignItems: 'center',
+    minWidth: cx(100)
+  },
+  summaryImg: {
+    width: cx(12),
+    height: cx(12),
+    marginRight: cx(6)
+  },
+  leftTitle: {
+    fontSize: cx(14),
+    color: '#000'
+  },
+  summaryRight: {
+    flex: 1,
+    flexDirection: 'column',
+    marginLeft: cx(15),
+  },
+  rightWrap: {
+    borderRadius: cx(16),
+    paddingHorizontal: cx(12),
+    alignSelf: 'flex-start',
+    backgroundColor: '#cbcbcb',
+  },
+  rightItem: {
+    color: '#000',
+    fontSize: cx(14)
+  },
+})
+
+export default memo(Summary)