Browse Source

修复在线获取Roku信息解析失败的问题,同时修改ruko.info文件格式。

JeffWang 2 years ago
parent
commit
0734e9fdfd

+ 1 - 2
FactoryTool_CShare/Business/CommonMethod.cs

@@ -265,7 +265,7 @@ namespace MOKA_Factory_Tools
                         id = JSON_SeleteNode(jObject["rokuCustomer"], "id").Trim(),
                         ordernum = JSON_SeleteNode(jObject["rokuCustomer"], "ordernum").Trim(),
                         brand = JSON_SeleteNode(jObject["rokuCustomer"], "brand").Trim(),
-                        region = JSON_SeleteNode(jObject["rokuCustomer"], "region").Trim(),
+                        //region = JSON_SeleteNode(jObject["rokuCustomer"], "region").Trim(),
                         oemmodel = JSON_SeleteNode(jObject["rokuCustomer"], "oemmodel").Trim(),
                         //supporturl = JSON_SeleteNode(jObject["rokuCustomer"], "supporturl").Trim(),
                         //supportphone = JSON_SeleteNode(jObject["rokuCustomer"], "supportphone").Trim(),
@@ -295,7 +295,6 @@ namespace MOKA_Factory_Tools
                 MessageBox.Show("Fail to parse MID info\r\n " + ex.Message);
                 return false;
             }
-
         }
 
         /// <summary>

+ 12 - 12
FactoryTool_CShare/Business/V2Method.cs

@@ -44,20 +44,20 @@ namespace MOKA_Factory_Tools
             {
                 JObject jObject = JObject.Parse(strRokuInfo);
                 RokuCustomer rokuCustomer = new RokuCustomer();
-                rokuCustomer.id = CommonMethod.JSON_SeleteNode(jObject["rokuCustomer"], "id").Trim();
-                rokuCustomer.ordernum = CommonMethod.JSON_SeleteNode(jObject["rokuCustomer"], "ordernum").Trim();
-                rokuCustomer.brand = CommonMethod.JSON_SeleteNode(jObject["rokuCustomer"], "brand").Trim();
-                rokuCustomer.oemmodel = CommonMethod.JSON_SeleteNode(jObject["rokuCustomer"], "oemmodel").Trim();
-                rokuCustomer.productiondate = CommonMethod.JSON_SeleteNode(jObject["rokuCustomer"], "productiondate").Trim();
-                rokuCustomer.remotetype = CommonMethod.JSON_SeleteNode(jObject["rokuCustomer"], "remotetype").Trim();
-                rokuCustomer.updatetime = CommonMethod.JSON_SeleteNode(jObject["rokuCustomer"], "updatetime").Trim();
-                rokuCustomer.createtime = CommonMethod.JSON_SeleteNode(jObject["rokuCustomer"], "createtime").Trim();
-                rokuCustomer.isdelete = CommonMethod.JSON_SeleteNode(jObject["rokuCustomer"], "isdelete").Trim();
-
-                if (jObject["rokuCustomer"]["data"] != null)
+                rokuCustomer.id = jObject["id"].ToString().Trim();
+                rokuCustomer.ordernum = jObject["ordernum"].ToString().Trim();
+                rokuCustomer.brand = jObject["brand"].ToString().Trim();
+                rokuCustomer.oemmodel = jObject["oemmodel"].ToString().Trim();
+                rokuCustomer.productiondate = jObject["productiondate"].ToString().Trim();
+                rokuCustomer.remotetype = jObject["remotetype"].ToString().Trim();
+                rokuCustomer.updatetime = jObject["updatetime"].ToString().Trim();
+                rokuCustomer.createtime = jObject["createtime"].ToString().Trim();
+                rokuCustomer.isdelete = jObject["isdelete"].ToString().Trim();
+
+                if (jObject["data"] != null)
                 {
                     rokuCustomer.rokuData = new List<RokuData>();
-                    foreach (var item in jObject["rokuCustomer"]["data"])
+                    foreach (var item in jObject["data"])
                     {
                         RokuData rokuData = new RokuData();
                         rokuData.region = item["region"].Value<string>();

+ 0 - 1
FactoryTool_CShare/Models/StructList.cs

@@ -44,7 +44,6 @@ namespace MOKA_Factory_Tools
         public string id { get; set; }
         public string ordernum { get; set; }
         public string brand { get; set; }
-        public string region { get; set; }
         public string oemmodel { get; set; }
         public string productiondate { get; set; }
         public string remotetype { get; set; }

+ 0 - 1
FactoryTool_CShare/Views/OperationPanel.cs

@@ -6340,7 +6340,6 @@ namespace MOKA_Factory_Tools
                     midListNow.rokuCustomer.brand + "\r\nOEM Model:" +
                     midListNow.rokuCustomer.oemmodel + "\r\nDate:" + 
                     midListNow.rokuCustomer.productiondate + "\r\nRegion:" +
-                    midListNow.rokuCustomer.region + "\r\nPhone:" +
                     JsonConvert.SerializeObject(midListNow.rokuCustomer.rokuData).ToString() + "\r\nData:" +
                     midListNow.rokuCustomer.remotetype, LResource.ProductMsg);
             else