Ver código fonte

region做为组内参数。

JeffWang 2 anos atrás
pai
commit
be007368eb

+ 1 - 2
FactoryTool_CShare/Business/V2Method.cs

@@ -47,7 +47,6 @@ namespace MOKA_Factory_Tools
                 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.region = CommonMethod.JSON_SeleteNode(jObject["rokuCustomer"], "region").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();
@@ -61,7 +60,7 @@ namespace MOKA_Factory_Tools
                     foreach (var item in jObject["rokuCustomer"]["data"])
                     {
                         RokuData rokuData = new RokuData();
-                        rokuData.name = item["name"].Value<string>();
+                        rokuData.region = item["region"].Value<string>();
                         rokuData.supporturl = item["supporturl"].Value<string>();
                         rokuData.supportphone = item["supportphone"].Value<string>();
 

+ 1 - 1
FactoryTool_CShare/Models/StructList.cs

@@ -34,7 +34,7 @@ namespace MOKA_Factory_Tools
 
     public class RokuData
     {
-        public string name { get; set; }
+        public string region { get; set; }
         public string supporturl { get; set; }
         public string supportphone { get; set; }
     }

+ 31 - 31
FactoryTool_CShare/Views/OperationPanel.cs

@@ -4369,53 +4369,53 @@ namespace MOKA_Factory_Tools
                     goto end;
                 }
 
-                string region = midListNow.rokuCustomer.region;
-                Log.WriteInfoLog("Write Roku region...");
-                if (SerialCMD.SetROKURegion(TVPort, Encoding.ASCII.GetBytes(region), out result, out data, out error, SerailDelay))
+                if ( midListNow.rokuCustomer.rokuData != null && midListNow.rokuCustomer.rokuData.Count != 0 )
                 {
-                    Log.WriteInfoLog("Check Roku region...");
-                    if (SerialCMD.CheckROKURegion(TVPort, out result, out data, out error, SerailDelay))
+                    foreach (var item in midListNow.rokuCustomer.rokuData )
                     {
-                        Log.WriteInfoLog("Read Roku region...");
-                        if (SerialCMD.GetROKURegion(TVPort, out result, out data, out error, SerailDelay))
+                        Log.WriteInfoLog(string.Format("{0} to be write", item.region));
+
+                        string region = item.region;
+                        Log.WriteInfoLog("Write Roku region...");
+                        if (SerialCMD.SetROKURegion(TVPort, Encoding.ASCII.GetBytes(region), out result, out data, out error, SerailDelay))
                         {
-                            if (SerialInit.BytesCompare_Base64(data, Encoding.ASCII.GetBytes(region)))
+                            Log.WriteInfoLog("Check Roku region...");
+                            if (SerialCMD.CheckROKURegion(TVPort, out result, out data, out error, SerailDelay))
                             {
-                                Log.WriteInfoLog("ROKU region 写入成功:" + Encoding.ASCII.GetString(data));
+                                Log.WriteInfoLog("Read Roku region...");
+                                if (SerialCMD.GetROKURegion(TVPort, out result, out data, out error, SerailDelay))
+                                {
+                                    if (SerialInit.BytesCompare_Base64(data, Encoding.ASCII.GetBytes(region)))
+                                    {
+                                        Log.WriteInfoLog("ROKU region 写入成功:" + Encoding.ASCII.GetString(data));
+                                    }
+                                    else
+                                    {
+                                        ErrMsg = string.Format("{0}  Contrast ROKU region fail!", SN);
+                                        Log.WriteErrorLog(ErrMsg);
+                                        goto end;
+                                    }
+                                }
+                                else
+                                {
+                                    ErrMsg = string.Format("{0}  Read ROKU region fail!", SN);
+                                    Log.WriteErrorLog(ErrMsg);
+                                    goto end;
+                                }
                             }
                             else
                             {
-                                ErrMsg = string.Format("{0}  Contrast ROKU region fail!", SN);
+                                ErrMsg = string.Format("{0}  Check ROKU region fail!", SN);
                                 Log.WriteErrorLog(ErrMsg);
                                 goto end;
                             }
                         }
                         else
                         {
-                            ErrMsg = string.Format("{0}  Read ROKU region fail!", SN);
+                            ErrMsg = string.Format("{0}  Write ROKU region fail!", SN);
                             Log.WriteErrorLog(ErrMsg);
                             goto end;
                         }
-                    }
-                    else
-                    {
-                        ErrMsg = string.Format("{0}  Check ROKU region fail!", SN);
-                        Log.WriteErrorLog(ErrMsg);
-                        goto end;
-                    }
-                }
-                else
-                {
-                    ErrMsg = string.Format("{0}  Write ROKU region fail!", SN);
-                    Log.WriteErrorLog(ErrMsg);
-                    goto end;
-                }
-
-                if ( midListNow.rokuCustomer.rokuData != null && midListNow.rokuCustomer.rokuData.Count != 0 )
-                {
-                    foreach (var item in midListNow.rokuCustomer.rokuData )
-                    {
-                        Log.WriteInfoLog(string.Format("{0} to be write", item.name));
 
                         string phone = item.supportphone;
                         Log.WriteInfoLog("Write Roku phone...");