Ver Fonte

机器人异常处理

huhao@jgai.com há 5 meses atrás
pai
commit
e8a8f80217

+ 14 - 0
entry/src/main/ets/common/component/TitleStateComp.ets

@@ -160,6 +160,20 @@ export struct TitleStateComp {
 
         Row() {
           Row() {
+            Image($r("app.media.menu_robot"))
+              .height(px2vp(48))
+              .width(px2vp(48))// .backgroundColor(Color.Green)
+              .onClick(() => {
+                router.pushUrl({
+                  url: 'pages/RobotErrorHandle'
+                })
+              })
+          }
+          .height('100%')
+          .width('7.2%')
+          .justifyContent(FlexAlign.Center)
+
+          Row() {
             Image($r("app.media.hongDa_black"))
               .height(px2vp(48))
               .width(px2vp(48))// .backgroundColor(Color.Green)

+ 2 - 12
entry/src/main/ets/common/constants/CommonConstants.ets

@@ -31,7 +31,7 @@ export default class CommonConstants {
   static readonly ROBOTS: RobotInfo[] = [
     {
       id: 1,
-      robotCode: 'JGRR1135554213',
+      robotCode: 'rgv2',
       storageId: 1,
       robotType: 2,
       robotToward: 2,
@@ -41,7 +41,7 @@ export default class CommonConstants {
     } as RobotInfo,
     {
       id: 2,
-      robotCode: 'JGRR1123554233',
+      robotCode: 'rgv3',
       storageId: 1,
       robotType: 2,
       robotToward: 1,
@@ -49,16 +49,6 @@ export default class CommonConstants {
       y: 2,
       lastSelfCheck: '2024/02/16 10:56:34'
     } as RobotInfo,
-    {
-      id: 3,
-      robotCode: 'JGRR1147006978',
-      storageId: 1,
-      robotType: 2,
-      robotToward: 3,
-      x: 6,
-      y: 2,
-      lastSelfCheck: '2024/02/16 14:23:34'
-    } as RobotInfo,
   ]
   // 工步展示图
   static readonly STEP_IMAGES: Resource[] = [

+ 67 - 0
entry/src/main/ets/common/util/request/RobotErrorHandleRequest.ets

@@ -0,0 +1,67 @@
+import axios, {
+  AxiosError,
+  AxiosResponse,
+  AxiosRequestHeaders,
+  AxiosRequestConfig,
+  CreateAxiosDefaults,
+  InternalAxiosRequestConfig
+} from '@ohos/axios';
+
+import { printError, printRequest, printResponse, handleRes } from './Helps';
+
+
+const baseUrl = "http://10.88.20.150:8000/"
+const DEBUG = true //
+
+// 创建实例
+const StorageRequest = axios.create(
+
+  {
+    baseURL: baseUrl,
+    headers: {
+      'Content-Type': 'application/json;charset=UTF-8',
+    },
+    timeout: 60 * 1000,
+  }
+)
+
+// 添加请求拦截器
+StorageRequest.interceptors.request.use((config: InternalAxiosRequestConfig) => {
+
+  printRequest(config)
+  return config;
+}, (error: AxiosError) => {
+  // 对请求错误做些什么
+  printError(error)
+  return Promise.reject(error);
+});
+
+
+// 添加响应拦截器
+StorageRequest.interceptors.response.use((response: AxiosResponse) => {
+  // 对响应数据做点什么
+  printResponse(response)
+  let res = handleRes(response)
+  let success = res[0] as boolean
+  let msg = res[1] as string
+  console.debug("handleRes的返回结果 ", success, msg)
+
+  if (success) {
+    return response.data.data;
+  }
+  else {
+    return Promise.reject<string>(msg)
+  }
+
+}, (error: AxiosError) => {
+  // 对响应错误做点什么
+  printError(error)
+
+  return Promise.reject(error);
+});
+
+export default StorageRequest;
+
+
+
+

+ 41 - 0
entry/src/main/ets/model/MaterialBox.ets

@@ -0,0 +1,41 @@
+// 载具信息
+export default class MaterialBox {
+  // 创建时间
+  created?: string
+  // 创建人
+  creator?: string
+  // 是否删除
+  deleted?: number
+  // 部门ID
+  deptId?: string
+  // 主键
+  id?: string
+  // 组织ID
+  orgId?: string
+  // 修改时间
+  updated?: string
+  // 上次修改人
+  updator?: string
+  // 容量
+  capacity?: number
+  // 载具类别(0通用 1抖盘 2料盘)
+  category?: number
+  // 载具编号
+  code?: string
+  // 装载数量
+  loadNum?: number
+  // 最大使用次数
+  maxUseNum?: number
+  // 载具名称
+  name?: string
+  // 资产编号
+  propertyCode?: string
+  // 备注
+  remark?: string
+  // 尺寸规格
+  sizeSpec?: string
+  // 状态(0.空闲 1.占用 2.报废)
+  state?: string
+  // 通用性(0通用 1产品专属)
+  universal?: number
+}

+ 10 - 10
entry/src/main/ets/pages/RobotDebug.ets

@@ -26,7 +26,7 @@ export const NavigationList: NavigationItem[] = [
   {
     id: 1,
     text: '位移',
-    icon: $r('app.media.daohangyidong')
+    icon: $r("app.media.robot_move")
   },
   {
     id: 2,
@@ -36,12 +36,12 @@ export const NavigationList: NavigationItem[] = [
   {
     id: 3,
     text: '吊篮',
-    icon: $r('app.media.daohangdiaolan')
+    icon: $r("app.media.hanging_basket")
   },
   {
     id: 4,
     text: '充电',
-    icon: $r('app.media.daohangchongdian')
+    icon: $r("app.media.robot_battery")
   },
 ]
 
@@ -249,8 +249,8 @@ export struct RobotDebug {
                     this.card('自动模式', $r('app.media.zongkongzidong'))
                     Divider().width('90%')
                       .margin({ bottom: '20px' })
-                    this.card('电机通电', $r('app.media.zongkongdianjitongdian'))
-                    this.card('电机断电', $r('app.media.zongkongguanbidianji'))
+                    this.card('电机通电', $r("app.media.electrical_machinery_on"))
+                    this.card('电机断电', $r("app.media.electrical_machinery_off"))
                   }
                   .alignItems(HorizontalAlign.Start)
                   .width('100%')
@@ -277,7 +277,7 @@ export struct RobotDebug {
                       .alignItems(HorizontalAlign.Start)
 
                       Blank()
-                      Image($r('app.media.weiyibianjiweizhi'))
+                      Image($r("app.media.coordinate_edit"))
                         .width('48px')
                         .height('48px')
                         .margin('20px')
@@ -335,8 +335,8 @@ export struct RobotDebug {
                     .alignItems(VerticalAlign.Bottom)
 
                     Divider().margin({ bottom: '20px' }).width('90%')
-                    this.card('提起', $r('app.media.dianlanshang'))
-                    this.card('放下', $r('app.media.dianlanxia'))
+                    this.card('提起', $r("app.media.hanging_basket_up"))
+                    this.card('放下', $r("app.media.hanging_basket_down"))
                     Divider().margin({ bottom: '20px' }).width('90%')
                     this.card('张开爪夹', $r('app.media.dianlanzhangkai'))
                     this.card('闭合爪夹', $r('app.media.dianlanbihe'))
@@ -428,8 +428,8 @@ export struct RobotDebug {
                     .height('26px')
                     .margin({ top: '20px' })
                     Divider().margin({ bottom: '20px' }).width('90%')
-                    this.card('开始充电', $r('app.media.chongdianlianjie'))
-                    this.card('停止充电', $r('app.media.chongdianduankai'))
+                    this.card('开始充电', $r("app.media.robot_charge_connect"))
+                    this.card('停止充电', $r("app.media.robot_charge_disconnect"))
                   }
                   .alignItems(HorizontalAlign.Start)
                   .width('100%')

Diff do ficheiro suprimidas por serem muito extensas
+ 998 - 0
entry/src/main/ets/pages/RobotErrorHandle.ets


BIN
entry/src/main/ets/pages/car.png


+ 12 - 0
entry/src/main/ets/viewmodel/RobotErrorHandle/RequestParam.ets

@@ -0,0 +1,12 @@
+//机器人异常处理通用请求后台参数
+
+export default class RequestParamModel {
+  rgvNo?: string
+  x?: string
+  y?: string
+  category?: number
+  state?: number
+  option?: string
+  level?: string
+  action?: string
+}

entry/src/main/resources/base/media/weiyibianjiweizhi.png → entry/src/main/resources/base/media/coordinate_edit.png


entry/src/main/resources/base/media/zongkongguanbidianji.png → entry/src/main/resources/base/media/electrical_machinery_off.png


entry/src/main/resources/base/media/zongkongdianjitongdian.png → entry/src/main/resources/base/media/electrical_machinery_on.png


entry/src/main/resources/base/media/daohangdiaolan.png → entry/src/main/resources/base/media/hanging_basket.png


entry/src/main/resources/base/media/dianlanxia.png → entry/src/main/resources/base/media/hanging_basket_down.png


entry/src/main/resources/base/media/dianlanshang.png → entry/src/main/resources/base/media/hanging_basket_up.png


Diff do ficheiro suprimidas por serem muito extensas
+ 6 - 0
entry/src/main/resources/base/media/menu_robot.svg


entry/src/main/resources/base/media/daohangchongdian.png → entry/src/main/resources/base/media/robot_battery.png


entry/src/main/resources/base/media/chongdianlianjie.png → entry/src/main/resources/base/media/robot_charge_connect.png


entry/src/main/resources/base/media/chongdianduankai.png → entry/src/main/resources/base/media/robot_charge_disconnect.png


entry/src/main/resources/base/media/daohangyidong.png → entry/src/main/resources/base/media/robot_move.png


+ 2 - 1
entry/src/main/resources/base/profile/main_pages.json

@@ -19,6 +19,7 @@
     "pages/RfidAllocation",
     "pages/OutboundStation",
     "pages/WarehouseMap",
-    "pages/StationDevicesPage"
+    "pages/StationDevicesPage",
+    "pages/RobotErrorHandle"
   ]
 }