dji_mqtt_connect 0.1.36.2 → 0.1.37

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 940329d2cd6cc1a579fda21b7d6325a9731ccf4b0834773fd47a5aab77653374
-  data.tar.gz: 1d7197e5354a9cfad990ec0a8c27fbf358ae6a8ed4def7327321363e20c0db27
+  metadata.gz: c9d9f413e3ed17ec23e3ebd7f0922c723d02c34887e21370fc93c4f3c967e501
+  data.tar.gz: 896905fcf6590cc681dd214b703d423f9b1387ed51b26218d6e4d4ce25b0f882
 SHA512:
-  metadata.gz: 229a6017739b1c560fedca7f24bf7f6b4a4821d02a88c0f328a1b145dabeab8e084566d7cbba36ba1a4022b28c2f22c3cca3c8130f06c5e1f5de1f72ad29916c
-  data.tar.gz: 2480edeb9ed44f2b5c03c2f5db02532af5ccd8437da71c8d807120ebf8edf48dd5bd5416c907a0f076facd8b990c6d9d119c6358b38df49d76694e5370d6bcb4
+  metadata.gz: e94e7632a218b5da97d0529bb5303e4300995e16b91870c689c7ca70140a98d852bbdf96c2d1e95e8e59d8a0cc6d79e7a2ca7752ad1f2d4d096f9fc9d40ae00c
+  data.tar.gz: 977f59258206042ee6f707f0a1c8f1a966b750b7f6cb0ef30f84131f44f5571acb7d15d1c640b69ce34b7adb4155c77f285f5718c28411bc77a89d4d02c038b9

data/config/locales/fileupload_modules.en.yml

@@ -0,0 +1,5 @@
+en:
+  dji_mqtt_connect:
+    fileupload_modules:
+      "0": "Aircraft"
+      "3": "DJI Dock"

data/config/locales/thing_product_services.en.yml

@@ -15,6 +15,9 @@ en:
       drone_format: "Requesting aircraft data formatting"
       esim_activate: "Requesting eSIM activation"
       esim_operator_switch: "Requesting eSIM operator switch"
+      fileupload_list: "Requesting log file list"
+      fileupload_start: "Requesting log file upload"
+      fileupload_update: "Requesting log file upload state change: %{status}"
       flighttask_execute: "Requesting flight task execution"
       flighttask_pause: "Requesting pause for all Flights"
       flighttask_prepare: "Requesting flight task preparation"

data/lib/dji_mqtt_connect/factories/events/drc_status_notify.rb

@@ -4,22 +4,28 @@ module DjiMqttConnect
   module Factories::EventsMessages
     ### DRC Status Notify ###
 
-    def build_thing_product_drc_status_notify_events_message
+    def build_thing_product_drc_status_notify_events_message(
+      drc_state: Thing::Product::DrcStatusNotifyEventsMessage::DRC_STATE_CONNECTED,
+      result: 0,
+      timestamp: Message.current_timestamp
+    )
       message_data = {
-        result: 0,
-        drc_state: 2
+        result: result,
+        drc_state: drc_state
       }
 
-      Thing::Product::DrcStatusNotifyEventsMessage.new(
+      message_attributes = {
         bid: Message.generate_bid,
         tid: Message.generate_tid,
-        timestamp: Message.current_timestamp,
         _method: "drc_status_notify",
         need_reply: 1,
         gateway: "GATEWAYSN",
         data: message_data,
         _data: message_data
-      )
+      }
+      message_attributes[:timestamp] = timestamp unless timestamp.nil?
+
+      Thing::Product::DrcStatusNotifyEventsMessage.new(message_attributes)
     end
   end
 end

data/lib/dji_mqtt_connect/factories/events/flighttask_progress.rb

@@ -0,0 +1,60 @@
+# frozen_string_literal: true
+
+module DjiMqttConnect
+  module Factories::EventsMessages
+    def build_thing_product_flighttask_progress_events_message(
+      flight_id: "flight_id",
+      status: "ok",
+      result: 0,
+      current_step: 19,
+      percent: 100,
+      current_waypoint_index: 3,
+      break_reason: 1,
+      track_id: "track_id",
+      wayline_mission_state: 2
+    )
+      message_ext = {
+        current_waypoint_index: current_waypoint_index,
+        media_count: 6,
+        track_id: track_id,
+        flight_id: flight_id,
+        wayline_mission_state: wayline_mission_state
+      }
+
+      unless break_reason.nil?
+        message_ext[:break_point] = {
+          index: 1,
+          state: 0,
+          progress: 0.34,
+          wayline_id: 0,
+          break_reason: break_reason,
+          latitude: 23.4,
+          longitude: 113.99,
+          height: 100.23,
+          attitude_head: 30
+        }
+      end
+
+      message_data = {
+        output: {
+          ext: message_ext,
+          progress: {
+            current_step: current_step,
+            percent: percent
+          },
+          status: status
+        },
+        result: result
+      }
+
+      Thing::Product::FlighttaskProgressEventsMessage.new(
+        bid: Message.generate_bid,
+        tid: Message.generate_tid,
+        data: message_data,
+        _data: message_data,
+        _method: "flighttask_progress",
+        timestamp: Message.current_timestamp
+      )
+    end
+  end
+end

data/lib/dji_mqtt_connect/factories/events/fly_to_point_progress.rb

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+module DjiMqttConnect
+  module Factories::EventsMessages
+    ### Fly to Point Progress ###
+
+    def build_thing_product_fly_to_point_progress_events_message(
+      fly_to_id: SecureRandom.uuid,
+      status: "wayline_progress",
+      result: 0,
+      remaining_distance: 0,
+      remaining_time: 0,
+      way_point_index: 0
+    )
+      message_data = {
+        fly_to_id: fly_to_id,
+        planned_path_points: [
+          {
+            height: BigDecimal("123.234"),
+            latitude: BigDecimal("13.23"),
+            longitude: BigDecimal("123.234")
+          }
+        ],
+        remaining_distance: remaining_distance,
+        remaining_time: remaining_time,
+        result: result,
+        status: status,
+        way_point_index: way_point_index
+      }
+
+      Thing::Product::FlyToPointProgressEventsMessage.new(
+        bid: Message.generate_bid,
+        tid: Message.generate_tid,
+        timestamp: Message.current_timestamp,
+        _method: "fly_to_point_progress",
+        need_reply: 1,
+        data: message_data,
+        _data: message_data
+      )
+    end
+  end
+end

data/lib/dji_mqtt_connect/factories/events/joystick_invalid_notify.rb

@@ -2,9 +2,11 @@
 
 module DjiMqttConnect
   module Factories::EventsMessages
-    def build_thing_product_joystick_invalid_notify_events_message
+    def build_thing_product_joystick_invalid_notify_events_message(
+      reason: Thing::Product::JoystickInvalidNotifyEventsMessage::REMOTE_CONTROLLER_LOST_CONNECTION_REASON
+    )
       message_data = {
-        reason: 0
+        reason: reason
       }
 
       Thing::Product::JoystickInvalidNotifyEventsMessage.new(

data/lib/dji_mqtt_connect/factories/events/takeoff_to_point_progress.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+module DjiMqttConnect
+  module Factories::EventsMessages
+    def build_thing_product_takeoff_to_point_progress_events_message(
+      flight_id: SecureRandom.uuid,
+      status: "wayline_ok",
+      result: 0,
+      remaining_distance: 100,
+      remaining_time: 10,
+      track_id: SecureRandom.uuid,
+      way_point_index: 3
+    )
+      message_data = {
+        flight_id: flight_id,
+        remaining_distance: remaining_distance,
+        remaining_time: remaining_time,
+        result: result,
+        status: status,
+        track_id: track_id,
+        way_point_index: way_point_index
+      }
+
+      Thing::Product::TakeoffToPointProgressEventsMessage.new(
+        bid: Message.generate_bid,
+        tid: Message.generate_tid,
+        timestamp: Message.current_timestamp,
+        _method: "takeoff_to_point_progress",
+        need_reply: 1,
+        data: message_data,
+        _data: message_data
+      )
+    end
+  end
+end

data/lib/dji_mqtt_connect/factories/events_messages.rb

@@ -210,45 +210,6 @@ module DjiMqttConnect
       )
     end
 
-    def build_thing_product_flighttask_progress_events_message
-      message_data = {
-        output: {
-          ext: {
-            current_waypoint_index: 3,
-            media_count: 6,
-            track_id: "track_id",
-            flight_id: "flight_id",
-            break_point: {
-              index: 1,
-              state: 0,
-              progress: 0.34,
-              wayline_id: 0,
-              break_reason: 1,
-              latitude: 23.4,
-              longitude: 113.99,
-              height: 100.23,
-              attitude_head: 30
-            }
-          },
-          progress: {
-            current_step: 19,
-            percent: 100
-          },
-          status: "ok"
-        },
-        result: 0
-      }
-
-      Thing::Product::FlighttaskProgressEventsMessage.new(
-        bid: Message.generate_bid,
-        tid: Message.generate_tid,
-        data: message_data,
-        _data: message_data,
-        _method: "flighttask_progress",
-        timestamp: Message.current_timestamp
-      )
-    end
-
     def build_thing_product_flighttask_ready_events_message
       message_data = {
         flight_ids: [
@@ -267,36 +228,6 @@ module DjiMqttConnect
       )
     end
 
-    ### Fly to Point Progress ###
-
-    def build_thing_product_fly_to_point_progress_events_message
-      message_data = {
-        fly_to_id: SecureRandom.uuid,
-        planned_path_points: [
-          {
-            height: BigDecimal("123.234"),
-            latitude: BigDecimal("13.23"),
-            longitude: BigDecimal("123.234")
-          }
-        ],
-        remaining_distance: 0,
-        remaining_time: 0,
-        result: 0,
-        status: "wayline_progress",
-        way_point_index: 0
-      }
-
-      Thing::Product::FlyToPointProgressEventsMessage.new(
-        bid: Message.generate_bid,
-        tid: Message.generate_tid,
-        timestamp: Message.current_timestamp,
-        _method: "fly_to_point_progress",
-        need_reply: 1,
-        data: message_data,
-        _data: message_data
-      )
-    end
-
     def build_thing_product_highest_priority_upload_flighttask_media_events_message
       message_data = {
         flight_id: SecureRandom.uuid
@@ -377,28 +308,6 @@ module DjiMqttConnect
         _data: message_data
       )
     end
-
-    def build_thing_product_takeoff_to_point_progress_events_message
-      message_data = {
-        flight_id: SecureRandom.uuid,
-        remaining_distance: 100,
-        remaining_time: 10,
-        result: 0,
-        status: "ok",
-        track_id: SecureRandom.uuid,
-        way_point_index: 3
-      }
-
-      Thing::Product::TakeoffToPointProgressEventsMessage.new(
-        bid: Message.generate_bid,
-        tid: Message.generate_tid,
-        timestamp: Message.current_timestamp,
-        _method: "takeoff_to_point_progress",
-        need_reply: 1,
-        data: message_data,
-        _data: message_data
-      )
-    end
   end
 end
 

data/lib/dji_mqtt_connect/factories/services/fileupload_list.rb

@@ -0,0 +1,55 @@
+# frozen_string_literal: true
+
+module DjiMqttConnect
+  module Factories::ServicesMessages
+    def build_thing_product_fileupload_list_services_message
+      Thing::Product::FileuploadListServicesMessage.build(
+        module_list: [0, 3]
+      )
+    end
+
+    def build_thing_product_fileupload_list_services_reply_message(result: 0)
+      timestamp = Message.current_timestamp
+      message_data = {
+        result: result,
+        files: [
+          {
+            device_sn: "DRONESN",
+            result: 0,
+            module: Types::FILEUPLOAD_MODULE_AIRCRAFT,
+            list: [
+              {
+                boot_index: 1111,
+                start_time: timestamp - 4000,
+                end_time: timestamp - 3000,
+                size: 33789
+              }
+            ]
+          },
+          {
+            device_sn: "DOCKSN",
+            result: 0,
+            module: Types::FILEUPLOAD_MODULE_DOCK,
+            list: [
+              {
+                boot_index: 22222,
+                start_time: timestamp - 2000,
+                end_time: timestamp - 1000,
+                size: 36772
+              }
+            ]
+          }
+        ]
+      }
+
+      Thing::Product::FileuploadListServicesReplyMessage.new(
+        bid: Message.generate_bid,
+        tid: Message.generate_tid,
+        timestamp: timestamp,
+        _method: "fileupload_list",
+        _data: message_data,
+        data: message_data
+      )
+    end
+  end
+end

data/lib/dji_mqtt_connect/factories/services/fileupload_start.rb

@@ -0,0 +1,58 @@
+# frozen_string_literal: true
+
+module DjiMqttConnect
+  module Factories::ServicesMessages
+    def build_thing_product_fileupload_start_services_message
+      timestamp = Message.current_timestamp
+      Thing::Product::FileuploadStartServicesMessage.build(
+        data: {
+          bucket: "stg-dji-service-hz-ksd7",
+          region: "hz",
+          credentials: {
+            access_key_id: "STS.access_key_id",
+            access_key_secret: "access_key_secret",
+            expire: 3600,
+            security_token: "security_token"
+          },
+          endpoint: "https://oss-cn-hangzhou.aliyuncs.com",
+          params: {
+            files: [
+              {
+                list: [
+                  {
+                    boot_index: 1111,
+                    end_time: timestamp - 3000,
+                    size: 33789,
+                    start_time: timestamp - 4000
+                  },
+                  {
+                    boot_index: 22222,
+                    end_time: timestamp - 1000,
+                    size: 33789,
+                    start_time: timestamp - 2000
+                  }
+                ],
+                module: Types::FILEUPLOAD_MODULE_DOCK,
+                object_key: "object_key"
+              }
+            ]
+          },
+          provider: "ali"
+        }
+      )
+    end
+
+    def build_thing_product_fileupload_start_services_reply_message(result: 0)
+      message_data = {result: result}
+
+      Thing::Product::FileuploadStartServicesReplyMessage.new(
+        bid: Message.generate_bid,
+        tid: Message.generate_tid,
+        timestamp: Message.current_timestamp,
+        _method: "fileupload_start",
+        _data: message_data,
+        data: message_data
+      )
+    end
+  end
+end

data/lib/dji_mqtt_connect/factories/services/fileupload_update.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module DjiMqttConnect
+  module Factories::ServicesMessages
+    def build_thing_product_fileupload_update_services_message
+      Thing::Product::FileuploadUpdateServicesMessage.build(
+        module_list: [0, 3]
+      )
+    end
+
+    def build_thing_product_fileupload_update_services_reply_message(result: 0)
+      message_data = {result: result}
+
+      Thing::Product::FileuploadUpdateServicesReplyMessage.new(
+        bid: Message.generate_bid,
+        tid: Message.generate_tid,
+        timestamp: Message.current_timestamp,
+        _method: "fileupload_update",
+        _data: message_data,
+        data: message_data
+      )
+    end
+  end
+end

data/lib/dji_mqtt_connect/factories/services/ir_metering_mode_set.rb

@@ -12,7 +12,7 @@ module DjiMqttConnect
 
     def build_thing_product_ir_metering_mode_set_services_message_data
       {
-        mode: Thing::Product::IrMeteringModeSetServicesMessage::MODE_POINT,
+        mode: Types::IR_METERING_MODE_POINT,
         payload_index: "39-0-7"
       }
     end

data/lib/dji_mqtt_connect/factories/services_messages.rb

@@ -30,52 +30,6 @@ module DjiMqttConnect
       Thing::Product::DroneOpenServicesMessage.build
     end
 
-    def build_thing_product_fileupload_list_services_message
-      Thing::Product::FileuploadListServicesMessage.build(
-        module_list: [0, 3]
-      )
-    end
-
-    def build_thing_product_fileupload_start_services_message
-      timestamp = Message.current_timestamp
-      Thing::Product::FileuploadStartServicesMessage.build(
-        data: {
-          bucket: "stg-dji-service-hz-ksd7",
-          region: "hz",
-          credentials: {
-            access_key_id: "STS.access_key_id",
-            access_key_secret: "access_key_secret",
-            expire: 3600,
-            security_token: "security_token"
-          },
-          endpoint: "https://oss-cn-hangzhou.aliyuncs.com",
-          params: {
-            files: [
-              {
-                list: [
-                  {
-                    boot_index: 1111,
-                    end_time: timestamp - 3000,
-                    size: 33789,
-                    start_time: timestamp - 4000
-                  },
-                  {
-                    boot_index: 22222,
-                    end_time: timestamp - 1000,
-                    size: 33789,
-                    start_time: timestamp - 2000
-                  }
-                ],
-                module: "3",
-                object_key: "object_key"
-              }
-            ]
-          },
-          provider: "ali"
-        }
-      )
-    end
-
     ### Flighttask Execute ###
 
     def build_thing_product_flighttask_execute_services_message

data/lib/dji_mqtt_connect/factories/services_reply/fly_to_point.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module DjiMqttConnect
+  module Factories
+    def build_thing_product_fly_to_point_services_reply_message(result: 0)
+      message_data = {result: result}
+
+      Thing::Product::FlyToPointServicesReplyMessage.new(
+        bid: Message.generate_bid,
+        tid: Message.generate_tid,
+        timestamp: Message.current_timestamp,
+        _method: "fly_to_point",
+        _data: message_data,
+        data: message_data
+      )
+    end
+  end
+end

data/lib/dji_mqtt_connect/factories/services_reply/fly_to_point_stop.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module DjiMqttConnect
+  module Factories
+    def build_thing_product_fly_to_point_stop_services_reply_message(result: 0)
+      message_data = {result: result}
+
+      Thing::Product::FlyToPointStopServicesReplyMessage.new(
+        bid: Message.generate_bid,
+        tid: Message.generate_tid,
+        timestamp: Message.current_timestamp,
+        _method: "fly_to_point_stop",
+        _data: message_data,
+        data: message_data
+      )
+    end
+  end
+end

data/lib/dji_mqtt_connect/factories/services_reply/fly_to_point_update.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module DjiMqttConnect
+  module Factories
+    def build_thing_product_fly_to_point_update_services_reply_message(result: 0)
+      message_data = {result: result}
+
+      Thing::Product::FlyToPointUpdateServicesReplyMessage.new(
+        bid: Message.generate_bid,
+        tid: Message.generate_tid,
+        timestamp: Message.current_timestamp,
+        _method: "fly_to_point_update",
+        _data: message_data,
+        data: message_data
+      )
+    end
+  end
+end

data/lib/dji_mqtt_connect/messages/thing/product/events/flighttask_progress.rb

@@ -36,7 +36,7 @@ module DjiMqttConnect
               attribute :index, Types::Integer
 
               # {"0":"On the wayline segment","1":"On the waypoint"}
-              attribute :state, Types::Integer.enum(0, 1)
+              attribute :state, Types::BreakPointState
 
               # {"min":"0","max":"1.0"}
               attribute :progress, Types::JSON::Decimal.constrained(gteq: 0, lteq: 1.0)
@@ -61,17 +61,7 @@ module DjiMqttConnect
           end
 
           # {"partially_done":"partially done","sent":"sent","in_progress":"in progress","ok":"success","paused":"paused","rejected":"rejected","failed":"failed","canceled":"canceled or stopped","timeout":"timeout"}
-          attribute :status, Types::String.enum(
-            "partially_done",
-            "sent",
-            "in_progress",
-            "ok",
-            "paused",
-            "rejected",
-            "failed",
-            "canceled",
-            "timeout"
-          )
+          attribute :status, Types::FlighttaskStatus
 
           def humanized_status
             I18n.t(status, scope: "dji_mqtt_connect.flighttask_status", default: status.titleize)

data/lib/dji_mqtt_connect/messages/thing/product/events/fly_to_point_progress.rb

@@ -27,7 +27,7 @@ module DjiMqttConnect
         include Mixins::ResultCode
 
         # {"wayline_cancel":"Cancel flying to target point","wayline_failed":"Execution failed","wayline_ok":"Executed successfully, flown to target point","wayline_progress":"Executing"}
-        attribute :status, Types::String
+        attribute :status, Types::FlyToPointProgressStatus
 
         attribute :way_point_index, Types::Integer
       end

data/lib/dji_mqtt_connect/messages/thing/product/events/hms.rb

@@ -8,18 +8,18 @@ module DjiMqttConnect
       attribute :data do
         attribute :list, Types::Array do
           # {"0":"Inform","1":"Notice","2":"Alarm"}
-          attribute :level, Types::Integer.enum(0, 1, 2)
+          attribute :level, Types::HmsLevel
 
           # {"0":"flight mission","1":"device management","2":"media","3":"hms"}
-          attribute :module, Types::Integer.enum(0, 1, 2, 3)
+          attribute :module, Types::HmsModule
 
           # {"0":"on the ground","1":"in the sky"}
-          attribute? :in_the_sky, Types::Integer.enum(0, 1)
+          attribute? :in_the_sky, Types::HmsInTheSky
 
           attribute :code, Types::String
 
           # {"0":"No","1":"Yes"}
-          attribute? :imminent, Types::Integer.enum(0, 1)
+          attribute? :imminent, Types::HmsImminent
 
           attribute :args do
             attribute :component_index, Types::Integer
@@ -28,7 +28,11 @@ module DjiMqttConnect
           end
 
           def in_the_sky?
-            in_the_sky == 1
+            in_the_sky == Types::HMS_IN_THE_SKY
+          end
+
+          def imminent?
+            imminent == Types::HMS_IMMINENT
           end
 
           def aircraft_message

data/lib/dji_mqtt_connect/messages/thing/product/events/takeoff_to_point_progress.rb

@@ -26,7 +26,7 @@ module DjiMqttConnect
         attribute :remaining_time, Types::JSON::Decimal
 
         # {"task_finish":"One-key takeoff mission completed","task_ready":"Ready for takeoff","wayline_cancel":"Cancel flying to target point","wayline_failed":"Execution failed","wayline_ok":"Executed successfully, flown to target point","wayline_progress":"Executing"}
-        attribute :status, Types::String
+        attribute :status, Types::TakeoffToPointProgressStatus
 
         attribute :track_id, Types::String | Types::Nil