!增加指定设备更新

Waste.Application/ThirdApiInfo/Dtos/ThirdApiInfoDto.cs

@@ -15,31 +15,38 @@ namespace Waste.Application.ThirdApiInfo
         /// 机器码
         /// </summary>
         public string ECode { get; set; } = "";
+
         /// <summary>
         /// IMEI
         /// </summary>
         public string IMEI { get; set; } = "";
+
         /// <summary>
         /// ICCID
         /// </summary>
         public string ICCID { get; set; } = "";
+
         /// <summary>
         /// IMSI
         /// </summary>
         public string IMSI { get; set; } = "";
+
         /// <summary>
         /// 信号强度
         /// </summary>
         public int GSLQ { get; set; } = 0;
+
         /// <summary>
         /// 纬度
         /// </summary>
         public decimal Latitude { get; set; } = 0;
+
         /// <summary>
         /// 经度
         /// </summary>
         public decimal Longitude { get; set; } = 0;
     }
+
     /// <summary>
     /// 注册注册信息返回值
     /// </summary>
@@ -49,14 +56,17 @@ namespace Waste.Application.ThirdApiInfo
         /// 设备状态,0-使用中,1-异常,2-检修,3-检修结束,4-启用，5-未知
         /// </summary>
         public int status { get; set; } = 0;
+
         /// <summary>
         /// 波特率
         /// </summary>
         public int baudrate { get; set; } = 9600;
+
         /// <summary>
         /// 串口号
         /// </summary>
         public string serialno { get; set; } = "/dev/ttyS3";
+
         /// <summary>
         /// websocket地址
         /// </summary>
@@ -66,27 +76,33 @@ namespace Waste.Application.ThirdApiInfo
         /// 时间戳
         /// </summary>
         public int timestamp { get; set; }
+
         /// <summary>
         /// 随机数
         /// </summary>
         public int noncestr { get; set; }
+
         /// <summary>
         /// 用户ID
         /// </summary>
         public string UserId { get; set; }
+
         /// <summary>
         /// secret
         /// </summary>
         public string Secret { get; set; }
+
         /// <summary>
         /// secrethash
         /// </summary>
         public string SecretHash { get; set; }
+
         /// <summary>
         /// 设备ID
         /// </summary>
         public string DeviceId { get; set; } = "";
     }
+
     /// <summary>
     /// 更新上报结果
     /// </summary>
@@ -101,6 +117,7 @@ namespace Waste.Application.ThirdApiInfo
         /// 机器码
         /// </summary>
         public string ECode { get; set; } = "";
+
         /// <summary>
         /// 上报状态,1-成功,0-失败
         /// </summary>
@@ -110,17 +127,19 @@ namespace Waste.Application.ThirdApiInfo
     /// <summary>
     /// 获取设备信息请求数据,并上报数据
     /// </summary>
-    public class GetDevInfoRequestDto: DevHeartRequestDto
+    public class GetDevInfoRequestDto : DevHeartRequestDto
     {
         /// <summary>
         /// 记录ID
         /// </summary>
         public string ResultId { get; set; } = "";
+
         /// <summary>
         /// 串口数据
         /// </summary>
         public string data { get; set; } = "";
     }
+
     /// <summary>
     /// 获取设备信息响应数据
     /// </summary>
@@ -130,42 +149,52 @@ namespace Waste.Application.ThirdApiInfo
         /// 解析数据是否正常
         /// </summary>
         public bool IsSuccessed { get; set; } = false;
+
         /// <summary>
         /// 时间戳
         /// </summary>
         public int timestamp { get; set; }
+
         /// <summary>
         /// 随机数
         /// </summary>
         public int noncestr { get; set; }
+
         /// <summary>
         /// 用户ID
         /// </summary>
         public string UserId { get; set; }
+
         /// <summary>
         /// secret
         /// </summary>
         public string Secret { get; set; }
+
         /// <summary>
         /// secrethash
         /// </summary>
         public string SecretHash { get; set; }
+
         /// <summary>
         /// 设备ID
         /// </summary>
         public string DeviceId { get; set; } = "";
+
         /// <summary>
         /// 上报地址
         /// </summary>
         public string PostUrl { get; set; } = "";
+
         /// <summary>
         /// 垃圾桶编号
         /// </summary>
         public string trash { get; set; } = "";
+
         /// <summary>
         /// 垃圾类型
         /// </summary>
         public int type { get; set; }
+
         /// <summary>
         /// 体重
         /// </summary>
@@ -180,15 +209,18 @@ namespace Waste.Application.ThirdApiInfo
         /// 数据扫描时间,UNIX时间戳
         /// </summary>
         public int ScanningTime { get; set; }
+
         /// <summary>
         /// 签名
         /// </summary>
         public string sign { get; set; }
+
         /// <summary>
         /// 记录ID
         /// </summary>
         public Guid ResultId { get; set; }
     }
+
     /// <summary>
     /// 日志上报
     /// </summary>
@@ -198,15 +230,18 @@ namespace Waste.Application.ThirdApiInfo
         /// 机器码
         /// </summary>
         public string ecode { get; set; }
+
         /// <summary>
         /// 位置
         /// </summary>
         public string ExceptionPos { get; set; }
+
         /// <summary>
         /// 错误信息
         /// </summary>
         public string ExceptionInfo { get; set; }
     }
+
     /// <summary>
     /// wifi模块发送的数据
     /// </summary>
@@ -217,6 +252,7 @@ namespace Waste.Application.ThirdApiInfo
         /// </summary>
         public string @params { get; set; }
     }
+
     /// <summary>
     /// wifi模块发送的数据解析
     /// </summary>
@@ -236,6 +272,7 @@ namespace Waste.Application.ThirdApiInfo
         /// 分隔符,固定为00
         /// </summary>
         public string splitstr { get; set; } = "";
+
         /// <summary>
         /// 解密出的16进制数据
         /// </summary>
@@ -245,15 +282,18 @@ namespace Waste.Application.ThirdApiInfo
         /// 数据是否验证通过
         /// </summary>
         public bool ischecked { get; set; } = true;
+
         /// <summary>
         /// 是否为心跳包
         /// </summary>
         public bool IsHeart { get; set; } = false;
+
         /// <summary>
         /// 结果集
         /// </summary>
         public byte[] databyte { get; set; }
     }
+
     /// <summary>
     /// 消息发送
     /// </summary>
@@ -263,21 +303,78 @@ namespace Waste.Application.ThirdApiInfo
         /// 设备ID
         /// </summary>
         public Guid DeviceId { get; set; }
+
         /// <summary>
         /// 垃圾类别
         /// </summary>
         public string WasteType { get; set; }
+
         /// <summary>
         /// 重量,单位KG
         /// </summary>
         public string Weight { get; set; }
+
         /// <summary>
         /// 垃圾桶编号
         /// </summary>
         public string TrashCode { get; set; }
+
         /// <summary>
         /// 上报时间
         /// </summary>
         public DateTime Time { get; set; }
     }
+
+    /// <summary>
+    /// app端返回的信息
+    /// </summary>
+    public class AppS2CDto<T>
+    {
+        /// <summary>
+        /// 信息
+        /// </summary>
+        public T status { get; set; }
+    }
+
+    /// <summary>
+    /// app端返回的通用信息
+    /// </summary>
+    public class AppCommonS2CDto
+    {
+        /// <summary>
+        /// 错误代码
+        /// </summary>
+        public int code { get; set; }
+
+        /// <summary>
+        /// 名称
+        /// </summary>
+        public string name { get; set; }
+
+        /// <summary>
+        /// 错误信息
+        /// </summary>
+        public string message { get; set; }
+    }
+
+    /// <summary>
+    /// app端版本信息返回值
+    /// </summary>
+    public class AppVerS2CDto
+    {
+        /// <summary>
+        /// 版本号
+        /// </summary>
+        public int code { get; set; }
+
+        /// <summary>
+        /// 版本说明
+        /// </summary>
+        public string name { get; set; }
+
+        /// <summary>
+        /// 下载地址
+        /// </summary>
+        public string update_url { get; set; }
+    }
 }

Waste.Application/ThirdApiInfo/OpenAppService.cs

@@ -231,6 +231,10 @@ namespace Waste.Application.ThirdApiInfo
             string rootpath = _hostingEnvironment.WebRootPath;
             //读取文件,返回升级信息
             var path = $"{rootpath}/apks/upgrade/{type}.txt";
+            if (myver == 421 && (ecode.Equals("419b553e92986112", StringComparison.OrdinalIgnoreCase) || ecode.Equals("fa324b8fa8da1fc0", StringComparison.OrdinalIgnoreCase)))
+            {
+                path = $"{rootpath}/apks/upgrade/OTHER.txt";
+            }
             if (!File.Exists(path))
             {
                 return new

WasteConsoleTest/WasteConsoleTest/WSocketClientHelp.cs

@@ -13,9 +13,9 @@ namespace WasteConsoleTest
         private ClientWebSocket ws = null;
         private Uri uri = null;
         private bool isUserClose = false;//是否最后由用户手动关闭
-        public static string Secret = "xsbem33eCm3eCYfP";
+        public static string Secret = "IICmWj5giYTWoCYd";
-        public static string SecretHash = "MULpdMXWuiECHK1kngvNgeA/s5DZT3pRsD371nj5EkA=";
+        public static string SecretHash = "6176c58a6569b3cf";
-        public static string deviceid = "08d9f5fc-e4d7-44e1-84fd-cd8aac2d7c2d";
+        public static string deviceid = "08d96cf1-d6b4-4e73-8356-02816912b3ba";
 
         // <summary>
         /// WebSocket状态