dev: enhance camera

component/rulex_api_server/apis/device_modbus_data_sheet_api.go

@@ -469,7 +469,7 @@ func parseModbusPointExcel(r io.Reader, sheetName string,
 		tag := row[0]
 		alias := row[1]
 		function, _ := strconv.ParseUint(row[2], 10, 8)
-		frequency, _ := strconv.ParseUint(row[3], 10, 8)
+		frequency, _ := strconv.ParseUint(row[3], 10, 64)
 		slaverId, _ := strconv.ParseUint(row[4], 10, 8)
 		address, _ := strconv.ParseUint(row[5], 10, 16)
 		quantity, _ := strconv.ParseUint(row[6], 10, 16)

device/generic_camera_stream.go

@@ -1,3 +1,6 @@
+//go:build amd64
+// +build amd64
+
 package device
 
 import (

device/generic_camera_stream_arm.go

@@ -1,3 +1,6 @@
+//go:build arm
+// +build arm
+
 // Copyright (C) 2023 wwhai
 //
 // This program is free software: you can redistribute it and/or modify
@@ -16,16 +19,14 @@
 package device
 
 import (
-	"github.com/hootrhino/rulex/component/interdb"
 	"github.com/hootrhino/rulex/component/iotschema"
-	"github.com/hootrhino/rulex/glogger"
+
 	"github.com/hootrhino/rulex/typex"
-	"github.com/hootrhino/rulex/utils"
-	"time"
 )
 
 type videoCamera struct {
 	typex.XStatus
+	status typex.DeviceState
 }
 
 /*
@@ -39,31 +40,8 @@ func NewVideoCamera(e typex.RuleX) typex.XDevice {
 	return hd
 }
 
-type MInternalNotify struct {
-	ID        uint      `gorm:"primaryKey" json:"id"`
-	CreatedAt time.Time `json:"created_at"`
-	UUID      string    `gorm:"not null"` // UUID
-	Type      string    `gorm:"not null"` // INFO | ERROR | WARNING
-	Status    int       `gorm:"not null"` // 1 未读 2 已读
-	Event     string    `gorm:"not null"` // 字符串
-	Ts        uint64    `gorm:"not null"` // 时间戳
-	Summary   string    `gorm:"not null"` // 概览，为了节省流量，在消息列表只显示这个字段，Info值为“”
-	Info      string    `gorm:"not null"` // 消息内容，是个文本，详情显示
-}
-
 func (hd *videoCamera) Init(devId string, configMap map[string]interface{}) error {
 	hd.PointId = devId
-	msg := `The current stage of multimedia functions on the ARM32 bit platform is not very perfect, please continue to pay attention to the future version iteration.`
-	glogger.GLogger.Warn(msg)
-	interdb.DB().Table("m_internal_notifies").Save(MInternalNotify{
-		UUID:    utils.MakeUUID("NOTIFY"), // UUID
-		Type:    `WARNING`,                // INFO | ERROR | WARNING
-		Status:  1,
-		Event:   `device.camera.warning`,
-		Ts:      uint64(time.Now().UnixMilli()),
-		Summary: "ARM32 CPU 性能不足",
-		Info:    msg,
-	})
 	return nil
 }
 

device/generic_camera_stream_arm64.go

@@ -0,0 +1,106 @@
+//go:build arm64
+// +build arm64
+
+// Copyright (C) 2023 wwhai
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as
+// published by the Free Software Foundation, either version 3 of the
+// License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+package device
+
+import (
+	"github.com/hootrhino/rulex/component/iotschema"
+
+	"github.com/hootrhino/rulex/typex"
+)
+
+type videoCamera struct {
+	typex.XStatus
+	status typex.DeviceState
+}
+
+/*
+*
+* ARM32不支持
+*
+ */
+func NewVideoCamera(e typex.RuleX) typex.XDevice {
+	hd := new(videoCamera)
+	hd.RuleEngine = e
+	return hd
+}
+
+func (hd *videoCamera) Init(devId string, configMap map[string]interface{}) error {
+	hd.PointId = devId
+	return nil
+}
+
+func (hd *videoCamera) Start(cctx typex.CCTX) error {
+	hd.Ctx = cctx.Ctx
+	hd.CancelCTX = cctx.CancelCTX
+
+	hd.status = typex.DEV_UP
+	return nil
+}
+
+func (hd *videoCamera) OnRead(cmd []byte, data []byte) (int, error) {
+
+	return 0, nil
+}
+
+// 把数据写入设备
+func (hd *videoCamera) OnWrite(cmd []byte, b []byte) (int, error) {
+	return 0, nil
+}
+
+// 设备当前状态
+func (hd *videoCamera) Status() typex.DeviceState {
+	return typex.DEV_UP
+}
+
+// 停止设备
+func (hd *videoCamera) Stop() {
+	hd.status = typex.DEV_STOP
+	hd.CancelCTX()
+}
+
+// 设备属性，是一系列属性描述
+func (hd *videoCamera) Property() []iotschema.IoTSchema {
+	return []iotschema.IoTSchema{}
+}
+
+// 真实设备
+func (hd *videoCamera) Details() *typex.Device {
+	return hd.RuleEngine.GetDevice(hd.PointId)
+}
+
+// 状态
+func (hd *videoCamera) SetState(status typex.DeviceState) {
+	hd.status = status
+
+}
+
+// 驱动
+func (hd *videoCamera) Driver() typex.XExternalDriver {
+	return nil
+}
+
+// --------------------------------------------------------------------------------------------------
+//
+// --------------------------------------------------------------------------------------------------
+func (hd *videoCamera) OnDCACall(UUID string, Command string, Args interface{}) typex.DCAResult {
+	return typex.DCAResult{}
+}
+func (hd *videoCamera) OnCtrl(cmd []byte, args []byte) ([]byte, error) {
+	return []byte{}, nil
+}

device/generic_opcua_device.go

@@ -140,7 +140,7 @@ func (opcDev *genericOpcuaDevice) Start(cctx typex.CCTX) error {
 	// 	opts = append(opts, opcua.SecurityFromEndpoint(ep, ua.UserTokenTypeAnonymous))
 	// }
 	//连接opcua -判断连接是否正常
-	opcDev.client = opcua.NewClient(ep.EndpointURL, opcua.SecurityMode(ua.MessageSecurityModeNone))
+	opcDev.client, _ = opcua.NewClient(ep.EndpointURL)
 	if err := opcDev.client.Connect(cctx.Ctx); err != nil {
 		glogger.GLogger.Error("Connect opcua client failed:", err)
 		return err
@@ -217,7 +217,7 @@ func (opcDev *genericOpcuaDevice) readNodes(cmd []byte, data []byte) (int, error
 			TimestampsToReturn: ua.TimestampsToReturnBoth,
 		}
 		ctx := context.Background()
-		resp, err := opcDev.client.ReadWithContext(ctx, req)
+		resp, err := opcDev.client.Read(ctx, req)
 		if err != nil {
 			opcDev.errorCount++
 			glogger.GLogger.Errorf("Read failed: %s", err)
@@ -309,7 +309,7 @@ func (sd *genericOpcuaDevice) Stop() {
 	sd.status = typex.DEV_DOWN
 	sd.CancelCTX()
 	if sd.driver != nil {
-		sd.client.CloseWithContext(sd.Ctx)
+		sd.client.Close(sd.Ctx)
 		sd.driver.Stop()
 	}
 }