From f755750b16c2ff7880c72104649d7373e99aba07 Mon Sep 17 00:00:00 2001
From: Hinse <756681202@qq.com>
Date: Wed, 18 Aug 2021 14:21:53 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BF=AE=E5=A4=8D16=E8=BF=9B?=
 =?UTF-8?q?=E5=88=B6=E8=BD=AC10=E8=BF=9B=E5=88=B6BUG=202=E3=80=81=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E7=BC=96=E8=BE=91=E9=A1=B5=E9=9D=A2=E6=96=87=E5=AD=97?=
 =?UTF-8?q?=E6=8F=8F=E8=BF=B0=E4=BF=AE=E6=94=B9=EF=BC=8C=E8=AE=BE=E5=A4=87?=
 =?UTF-8?q?=E7=BC=96=E5=8F=B7=E4=BF=AE=E4=B8=BA=E6=9C=BA=E5=99=A8=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Waste.Application/ThirdApiInfo/OpenService.cs | 53 ++++++++++++++++++-
 Waste.Application/Waste.Application.xml       |  7 +++
 Waste.Web.Entry/Pages/Device/Edit.cshtml      |  6 +--
 .../waste.ybhdmob.com.pubxml.user             |  2 +-
 WasteConsoleTest/WasteConsoleTest/Program.cs  |  2 +-
 .../WasteConsoleTest/WSocketClientHelp.cs     |  6 +--
 6 files changed, 67 insertions(+), 9 deletions(-)

diff --git a/Waste.Application/ThirdApiInfo/OpenService.cs b/Waste.Application/ThirdApiInfo/OpenService.cs
index a53a8b0..01293b1 100644
--- a/Waste.Application/ThirdApiInfo/OpenService.cs
+++ b/Waste.Application/ThirdApiInfo/OpenService.cs
@@ -154,7 +154,7 @@ namespace Waste.Application.ThirdApiInfo
                     var trashhex = data.data.Substring(16, 10);
                     var typehex = data.data.Substring(28, 16);
                     var weighthex = data.data.Substring(46, data.data.Length - 46);
-                    returndata.trash = (Int64.Parse(trashhex, System.Globalization.NumberStyles.HexNumber)).ToString(); ; //垃圾桶编号使用10进制
+                    returndata.trash = HextToDec(trashhex).ToString(); //垃圾桶编号使用10进制
                     var type = GetChsFromHex(typehex);
                     var weight = GetChsFromHex(weighthex);
                     returndata.type = TrashType(type);
@@ -236,6 +236,57 @@ namespace Waste.Application.ThirdApiInfo
             return chs.GetString(bytes);
         }
         /// <summary>
+        /// 16进制转10进制
+        /// </summary>
+        /// <param name="hex"></param>
+        /// <returns></returns>
+        public long HextToDec(string hex)
+        {
+            char[] nums = hex.ToCharArray();
+            long total = 0;
+            try
+            {
+                for (int i = 0; i < nums.Length; i++)
+                {
+                    String strNum = nums[i].ToString().ToUpper();
+                    switch (strNum)
+                    {
+                        case "A":
+                            strNum = "10";
+                            break;
+                        case "B":
+                            strNum = "11";
+                            break;
+                        case "C":
+                            strNum = "12";
+                            break;
+                        case "D":
+                            strNum = "13";
+                            break;
+                        case "E":
+                            strNum = "14";
+                            break;
+                        case "F":
+                            strNum = "15";
+                            break;
+                        default:
+                            break;
+                    }
+                    double power = Math.Pow(16, Convert.ToDouble(nums.Length - i - 1));
+                    total += Convert.ToInt64(strNum) * Convert.ToInt64(power);
+                }
+
+            }
+            catch (System.Exception ex)
+            {
+                string strErorr = ex.ToString();
+                return 0;
+            }
+
+
+            return total;
+        }
+        /// <summary>
         /// 心跳数据上报
         /// </summary>
         /// <param name="data"></param>
diff --git a/Waste.Application/Waste.Application.xml b/Waste.Application/Waste.Application.xml
index 0efe379..301125c 100644
--- a/Waste.Application/Waste.Application.xml
+++ b/Waste.Application/Waste.Application.xml
@@ -2322,6 +2322,13 @@
             <param name="hex"></param>
             <returns></returns>
         </member>
+        <member name="M:Waste.Application.ThirdApiInfo.OpenService.HextToDec(System.String)">
+            <summary>
+            16进制转10进制
+            </summary>
+            <param name="hex"></param>
+            <returns></returns>
+        </member>
         <member name="M:Waste.Application.ThirdApiInfo.OpenService.PostHeartAsync(Waste.Application.ThirdApiInfo.DevHeartRequestDto)">
             <summary>
             心跳数据上报
diff --git a/Waste.Web.Entry/Pages/Device/Edit.cshtml b/Waste.Web.Entry/Pages/Device/Edit.cshtml
index 6cf2fea..0c2cab4 100644
--- a/Waste.Web.Entry/Pages/Device/Edit.cshtml
+++ b/Waste.Web.Entry/Pages/Device/Edit.cshtml
@@ -9,7 +9,7 @@
             <div class="layui-form-item row">
                 <label class="layui-form-label col-md-2" for="Name">设备名称</label>
                 <div class="col-md-4">
-                    <input type="text" class="layui-input" id="Name" name="Name" value="@Model.data.Name" placeholder="请输入出厂编号" lay-verify="required" />
+                    <input type="text" class="layui-input" id="Name" name="Name" value="@Model.data.Name" placeholder="请输入设备名称" lay-verify="required" />
                 </div>
             </div>
             <div class="layui-form-item row">
@@ -19,9 +19,9 @@
                 </div>
             </div>
             <div class="layui-form-item row">
-                <label class="layui-form-label col-md-2" for="Ecode">设备编号</label>
+                <label class="layui-form-label col-md-2" for="Ecode">机器码</label>
                 <div class="col-md-4">
-                    <input type="text" class="layui-input" id="Ecode" name="Ecode" value="@Model.data.Ecode" placeholder="请输入设备编号" lay-verify="required" />
+                    <input type="text" class="layui-input" id="Ecode" name="Ecode" value="@Model.data.Ecode" placeholder="请输入设备机器码" lay-verify="required" />
                 </div>
             </div>
             <div class="layui-form-item row">
diff --git a/Waste.Web.Entry/Properties/PublishProfiles/waste.ybhdmob.com.pubxml.user b/Waste.Web.Entry/Properties/PublishProfiles/waste.ybhdmob.com.pubxml.user
index 1568bdf..8f9d6ff 100644
--- a/Waste.Web.Entry/Properties/PublishProfiles/waste.ybhdmob.com.pubxml.user
+++ b/Waste.Web.Entry/Properties/PublishProfiles/waste.ybhdmob.com.pubxml.user
@@ -5,6 +5,6 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <_PublishTargetUrl>D:\webpublish\waste.ybhdmob.com</_PublishTargetUrl>
-    <History>True|2021-08-17T02:05:15.4299188Z;True|2021-08-13T19:32:53.6307075+08:00;True|2021-08-13T19:29:50.5876782+08:00;True|2021-08-13T19:14:14.2545106+08:00;True|2021-08-13T15:24:09.4521125+08:00;True|2021-08-13T14:59:40.4579407+08:00;True|2021-08-13T10:02:29.7650246+08:00;True|2021-08-13T09:45:10.6245894+08:00;True|2021-08-12T20:11:21.5851106+08:00;True|2021-08-12T20:00:42.4820498+08:00;True|2021-08-12T18:44:08.3079650+08:00;True|2021-08-12T18:35:47.4730766+08:00;True|2021-08-12T18:32:10.9361388+08:00;True|2021-08-12T18:30:21.4006961+08:00;True|2021-08-12T18:13:00.9624470+08:00;True|2021-08-12T18:10:12.3459311+08:00;True|2021-08-12T18:09:18.8656414+08:00;True|2021-08-12T17:35:24.7213607+08:00;True|2021-08-11T07:54:57.1322848+08:00;True|2021-08-10T10:16:40.7495389+08:00;True|2021-08-03T11:16:02.7897282+08:00;True|2021-08-02T16:39:27.2332369+08:00;True|2021-08-02T15:07:40.7995318+08:00;True|2021-08-02T14:32:29.6885424+08:00;True|2021-08-02T14:31:18.6578543+08:00;True|2021-08-02T14:27:57.1301002+08:00;True|2021-08-02T10:55:40.3542370+08:00;True|2021-08-02T09:44:28.0994056+08:00;True|2021-08-01T13:49:38.4071985+08:00;True|2021-08-01T13:36:45.5372120+08:00;True|2021-08-01T11:00:19.6165520+08:00;True|2021-08-01T10:38:51.4029710+08:00;True|2021-07-31T20:27:53.6583811+08:00;True|2021-07-31T18:35:23.4214441+08:00;True|2021-07-31T17:34:14.0712243+08:00;True|2021-07-31T14:50:43.2065556+08:00;True|2021-07-30T17:59:30.2223340+08:00;True|2021-07-30T17:57:35.9412910+08:00;True|2021-07-30T17:07:58.3305971+08:00;True|2021-07-30T17:04:10.9244859+08:00;True|2021-07-30T17:02:12.1943634+08:00;True|2021-07-30T16:16:22.2838331+08:00;True|2021-07-30T15:05:26.5664155+08:00;True|2021-07-30T14:57:59.1966108+08:00;True|2021-07-30T14:54:25.8172908+08:00;True|2021-07-30T14:52:20.9209995+08:00;True|2021-07-30T14:35:29.5239463+08:00;True|2021-07-30T09:32:38.2676032+08:00;True|2021-07-30T09:14:42.6170851+08:00;True|2021-07-29T19:06:09.1449349+08:00;True|2021-06-11T08:16:29.9542894+08:00;True|2021-06-04T14:46:02.2707457+08:00;True|2021-06-02T15:08:52.8245632+08:00;True|2021-06-02T15:05:50.3614099+08:00;True|2021-06-02T14:59:32.3690948+08:00;True|2021-06-02T14:10:25.1182836+08:00;True|2021-06-02T14:09:54.9215833+08:00;True|2021-06-01T10:41:54.9488501+08:00;True|2021-06-01T10:38:56.0283198+08:00;True|2021-05-28T13:59:02.2308877+08:00;True|2021-05-28T11:56:26.6796406+08:00;True|2021-05-28T11:28:00.4087907+08:00;True|2021-05-27T16:18:09.5993838+08:00;True|2021-05-27T16:07:31.3484951+08:00;True|2021-05-27T11:30:37.9119310+08:00;True|2021-05-27T11:28:35.5374674+08:00;True|2021-05-27T08:00:09.1625592+08:00;True|2021-05-26T20:42:17.0852150+08:00;True|2021-05-26T20:36:49.7527415+08:00;True|2021-05-25T17:57:31.8791293+08:00;True|2021-05-25T13:49:29.6488978+08:00;True|2021-05-25T13:48:24.6686105+08:00;True|2021-05-25T13:25:41.2512493+08:00;True|2021-05-24T17:55:33.3800078+08:00;True|2021-05-20T14:35:30.6957985+08:00;True|2021-05-20T13:17:22.6192995+08:00;True|2021-05-20T10:51:38.1268169+08:00;True|2021-05-19T19:50:03.7000224+08:00;True|2021-05-19T19:44:27.2518811+08:00;True|2021-05-19T19:43:26.5916681+08:00;True|2021-05-19T19:36:29.3197365+08:00;True|2021-05-19T19:30:00.3802430+08:00;True|2021-05-19T17:55:23.7939835+08:00;True|2021-05-19T11:05:17.9043392+08:00;True|2021-05-19T10:19:38.4839988+08:00;True|2021-05-19T10:17:19.7430612+08:00;True|2021-05-19T10:13:23.0031721+08:00;True|2021-05-19T10:06:03.9881599+08:00;True|2021-05-18T14:39:03.8876574+08:00;True|2021-05-18T14:23:46.9818836+08:00;True|2021-05-18T14:19:56.2382079+08:00;True|2021-05-18T11:29:53.5497590+08:00;True|2021-05-18T11:16:18.0123853+08:00;True|2021-05-17T18:59:52.4159105+08:00;True|2021-05-17T18:53:37.9438984+08:00;True|2021-05-17T18:48:14.9625161+08:00;True|2021-05-17T17:46:03.7723404+08:00;True|2021-05-17T17:14:20.2312990+08:00;True|2021-05-17T16:44:34.5837616+08:00;True|2021-05-17T16:25:20.1087804+08:00;True|2021-05-17T11:35:27.9388562+08:00;</History>
+    <History>True|2021-08-18T06:01:33.0411246Z;True|2021-08-17T10:05:15.4299188+08:00;True|2021-08-13T19:32:53.6307075+08:00;True|2021-08-13T19:29:50.5876782+08:00;True|2021-08-13T19:14:14.2545106+08:00;True|2021-08-13T15:24:09.4521125+08:00;True|2021-08-13T14:59:40.4579407+08:00;True|2021-08-13T10:02:29.7650246+08:00;True|2021-08-13T09:45:10.6245894+08:00;True|2021-08-12T20:11:21.5851106+08:00;True|2021-08-12T20:00:42.4820498+08:00;True|2021-08-12T18:44:08.3079650+08:00;True|2021-08-12T18:35:47.4730766+08:00;True|2021-08-12T18:32:10.9361388+08:00;True|2021-08-12T18:30:21.4006961+08:00;True|2021-08-12T18:13:00.9624470+08:00;True|2021-08-12T18:10:12.3459311+08:00;True|2021-08-12T18:09:18.8656414+08:00;True|2021-08-12T17:35:24.7213607+08:00;True|2021-08-11T07:54:57.1322848+08:00;True|2021-08-10T10:16:40.7495389+08:00;True|2021-08-03T11:16:02.7897282+08:00;True|2021-08-02T16:39:27.2332369+08:00;True|2021-08-02T15:07:40.7995318+08:00;True|2021-08-02T14:32:29.6885424+08:00;True|2021-08-02T14:31:18.6578543+08:00;True|2021-08-02T14:27:57.1301002+08:00;True|2021-08-02T10:55:40.3542370+08:00;True|2021-08-02T09:44:28.0994056+08:00;True|2021-08-01T13:49:38.4071985+08:00;True|2021-08-01T13:36:45.5372120+08:00;True|2021-08-01T11:00:19.6165520+08:00;True|2021-08-01T10:38:51.4029710+08:00;True|2021-07-31T20:27:53.6583811+08:00;True|2021-07-31T18:35:23.4214441+08:00;True|2021-07-31T17:34:14.0712243+08:00;True|2021-07-31T14:50:43.2065556+08:00;True|2021-07-30T17:59:30.2223340+08:00;True|2021-07-30T17:57:35.9412910+08:00;True|2021-07-30T17:07:58.3305971+08:00;True|2021-07-30T17:04:10.9244859+08:00;True|2021-07-30T17:02:12.1943634+08:00;True|2021-07-30T16:16:22.2838331+08:00;True|2021-07-30T15:05:26.5664155+08:00;True|2021-07-30T14:57:59.1966108+08:00;True|2021-07-30T14:54:25.8172908+08:00;True|2021-07-30T14:52:20.9209995+08:00;True|2021-07-30T14:35:29.5239463+08:00;True|2021-07-30T09:32:38.2676032+08:00;True|2021-07-30T09:14:42.6170851+08:00;True|2021-07-29T19:06:09.1449349+08:00;True|2021-06-11T08:16:29.9542894+08:00;True|2021-06-04T14:46:02.2707457+08:00;True|2021-06-02T15:08:52.8245632+08:00;True|2021-06-02T15:05:50.3614099+08:00;True|2021-06-02T14:59:32.3690948+08:00;True|2021-06-02T14:10:25.1182836+08:00;True|2021-06-02T14:09:54.9215833+08:00;True|2021-06-01T10:41:54.9488501+08:00;True|2021-06-01T10:38:56.0283198+08:00;True|2021-05-28T13:59:02.2308877+08:00;True|2021-05-28T11:56:26.6796406+08:00;True|2021-05-28T11:28:00.4087907+08:00;True|2021-05-27T16:18:09.5993838+08:00;True|2021-05-27T16:07:31.3484951+08:00;True|2021-05-27T11:30:37.9119310+08:00;True|2021-05-27T11:28:35.5374674+08:00;True|2021-05-27T08:00:09.1625592+08:00;True|2021-05-26T20:42:17.0852150+08:00;True|2021-05-26T20:36:49.7527415+08:00;True|2021-05-25T17:57:31.8791293+08:00;True|2021-05-25T13:49:29.6488978+08:00;True|2021-05-25T13:48:24.6686105+08:00;True|2021-05-25T13:25:41.2512493+08:00;True|2021-05-24T17:55:33.3800078+08:00;True|2021-05-20T14:35:30.6957985+08:00;True|2021-05-20T13:17:22.6192995+08:00;True|2021-05-20T10:51:38.1268169+08:00;True|2021-05-19T19:50:03.7000224+08:00;True|2021-05-19T19:44:27.2518811+08:00;True|2021-05-19T19:43:26.5916681+08:00;True|2021-05-19T19:36:29.3197365+08:00;True|2021-05-19T19:30:00.3802430+08:00;True|2021-05-19T17:55:23.7939835+08:00;True|2021-05-19T11:05:17.9043392+08:00;True|2021-05-19T10:19:38.4839988+08:00;True|2021-05-19T10:17:19.7430612+08:00;True|2021-05-19T10:13:23.0031721+08:00;True|2021-05-19T10:06:03.9881599+08:00;True|2021-05-18T14:39:03.8876574+08:00;True|2021-05-18T14:23:46.9818836+08:00;True|2021-05-18T14:19:56.2382079+08:00;True|2021-05-18T11:29:53.5497590+08:00;True|2021-05-18T11:16:18.0123853+08:00;True|2021-05-17T18:59:52.4159105+08:00;True|2021-05-17T18:53:37.9438984+08:00;True|2021-05-17T18:48:14.9625161+08:00;True|2021-05-17T17:46:03.7723404+08:00;True|2021-05-17T17:14:20.2312990+08:00;True|2021-05-17T16:44:34.5837616+08:00;True|2021-05-17T16:25:20.1087804+08:00;True|2021-05-17T11:35:27.9388562+08:00;</History>
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/WasteConsoleTest/WasteConsoleTest/Program.cs b/WasteConsoleTest/WasteConsoleTest/Program.cs
index 9f54ce2..da97230 100644
--- a/WasteConsoleTest/WasteConsoleTest/Program.cs
+++ b/WasteConsoleTest/WasteConsoleTest/Program.cs
@@ -19,7 +19,7 @@ namespace WasteConsoleTest
         private static WSocketClientHelp wSocketClient = null;
         public static string Secret = "0eMqhAjefL0loGhH";
         public static string SecretHash = "d28a95b3d5d85ef0";
-        public static string SocketURL = "wss://bright.ljflytjl.cn:9101/device_rpc";
+        public static string SocketURL = "wss://api.device.suzhou.ljflytjl.cn/device_rpc";
         static async Task Main(string[] args)
         {
             var builder = new HostBuilder().ConfigureServices((hostContext, services) =>
diff --git a/WasteConsoleTest/WasteConsoleTest/WSocketClientHelp.cs b/WasteConsoleTest/WasteConsoleTest/WSocketClientHelp.cs
index de3d2e8..329836e 100644
--- a/WasteConsoleTest/WasteConsoleTest/WSocketClientHelp.cs
+++ b/WasteConsoleTest/WasteConsoleTest/WSocketClientHelp.cs
@@ -13,9 +13,9 @@ namespace WasteConsoleTest
         ClientWebSocket ws = null;
         Uri uri = null;
         bool isUserClose = false;//是否最后由用户手动关闭
-        public static string Secret = "0eMqhAjefL0loGhH";
-        public static string SecretHash = "d28a95b3d5d85ef0";
-        public static string deviceid = "08d954b6-df45-4de1-8fde-f5109798b855";
+        public static string Secret = "3R3KMr113DLvK8rE";
+        public static string SecretHash = "svfw5C77P+XqyEgZHrLzs45gs9RgdeXXzf6XAqA3p94=";
+        public static string deviceid = "08d961ee-22ae-40a6-8c14-a6b414f614a3";
 
         // <summary>
         /// WebSocket状态