1.优化 称重的颜色配置.json 放在 default 文件夹

2.优化 追边与扫描的服务器 Gage格式重写，create 与 init 分离

Project.FLY.FeedbackRenZiJia/FLY.FeedbackRenZiJia.UI.Client/UiModule/MenuSetting.xaml

@@ -18,7 +18,7 @@
                 Click="btnMenuClick">
             <StackPanel >
                 <iconPacks:PackIconMaterial Kind="Target" />
-                <TextBlock Text="自动风环" Foreground="White"/>
+                <TextBlock Text="风环" Foreground="White"/>
             </StackPanel>
         </Button>
     </StackPanel>

Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI.Fix.Server/MainWindow.xaml.cs

@@ -41,11 +41,11 @@ namespace FLY.Thick.Blowing.UI.Fix.Server
             if (!mPicHistory.Enable)
                 btnOpen.Visibility = Visibility.Collapsed;
 
-            mGage.mScanWarning.ScanWarningCheck += (s, e) =>
+            mGage.scanWarning.ScanWarningCheck += (s, e) =>
             {
                 mPicHistory.Add(e.profile, e.scandata, e.isWarning);
             };
-            Misc.BindingOperations.SetBinding(mGage.mScanWarning, "IsAutoTarget", mPicHistory, "IsAutoTarget");
+            Misc.BindingOperations.SetBinding(mGage.scanWarning, "IsAutoTarget", mPicHistory, "IsAutoTarget");
 
             this.Title = (new Misc.Ver() { SrcType = typeof(MainWindow) }).ToString();
 
@@ -55,7 +55,7 @@ namespace FLY.Thick.Blowing.UI.Fix.Server
 
             FObjBase.PollModule.Current.Start();
 
-            this.DataContext = mGage.mSysParam;
+            this.DataContext = mGage.sysParam;
         }
 
         private void button_open_Click(object sender, RoutedEventArgs e)

Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI/UiModule/MenuSetting.xaml.cs

@@ -34,7 +34,7 @@ namespace FLY.Thick.Blowing.UI.Fix.Client.UiModule
 
     public class UiModule2_MenuSetting : IUiModule2
     {
-        public string Title => "追边测厚参数";
+        public string Title => "追边菜单";
 
         public ComponentType Type => ComponentType.Menu;
 

Project.FLY.Thick.Blowing/FLY.Thick.Blowing/Server.OBJProxy/OBJProxy.cs

@@ -33,36 +33,36 @@ namespace FLY.Thick.Blowing.Server.OBJProxy
         public OBJProxy(int objsys_idx, TDGage gage)
         {
             TDGage mGage = gage;
-            bulkDataOBJProxy = new BulkDataService_OBJProxy(objsys_idx, OBJ_INTERFACE_ID.BULK_ID, mGage.mBulk);
+            bulkDataOBJProxy = new BulkDataService_OBJProxy(objsys_idx, OBJ_INTERFACE_ID.BULK_ID, mGage.bulk);
 
-            profileOBJProxy = new BlowingFixProfile_OBJProxy(objsys_idx, OBJ_INTERFACE_ID.BFPROFILE_ID, mGage.mProfile);
+            profileOBJProxy = new BlowingFixProfile_OBJProxy(objsys_idx, OBJ_INTERFACE_ID.BFPROFILE_ID, mGage.profile);
 
-            curveOBJProxy = new Curve_OBJProxy(objsys_idx, OBJ_INTERFACE_ID.CURVE_ID, mGage.mCurve);
+            curveOBJProxy = new Curve_OBJProxy(objsys_idx, OBJ_INTERFACE_ID.CURVE_ID, mGage.curve);
 
-            initparamOBJProxy = new Initparam_OBJProxy(objsys_idx, OBJ_INTERFACE_ID.INITPARAM_ID, mGage.mInitParam);
+            initparamOBJProxy = new Initparam_OBJProxy(objsys_idx, OBJ_INTERFACE_ID.INITPARAM_ID, mGage.initParam);
 
-            dynAreaOBJProxy = new DynArea_OBJProxy(objsys_idx, OBJ_INTERFACE_ID.DYNAREA_ID, mGage.mDynArea);
+            dynAreaOBJProxy = new DynArea_OBJProxy(objsys_idx, OBJ_INTERFACE_ID.DYNAREA_ID, mGage.dynArea);
 
-            flyADOBJProxy = new FlyAD_OBJProxy(objsys_idx, OBJ_INTERFACE_ID.FLYAD_ID, mGage.mFlyAD, mGage.AD2Thick);
+            flyADOBJProxy = new FlyAD_OBJProxy(objsys_idx, OBJ_INTERFACE_ID.FLYAD_ID, mGage.flyAd, mGage.AD2Thick);
 
-            fixOBJProxy = new Fix_OBJProxy(objsys_idx, OBJ_INTERFACE_ID.FIX_ID, mGage.mGMFix);
+            fixOBJProxy = new Fix_OBJProxy(objsys_idx, OBJ_INTERFACE_ID.FIX_ID, mGage.gmFix);
 
 
 
-            blowingOBJProxy = new BlowingFix_OBJProxy(objsys_idx, OBJ_INTERFACE_ID.RENZIJIA_ID, mGage.mGMRenZiJiaFix);
+            blowingOBJProxy = new BlowingFix_OBJProxy(objsys_idx, OBJ_INTERFACE_ID.RENZIJIA_ID, mGage.gmRenZiJiaFix);
 
-            bDetectOBJProxy = new BlowingDetect_OBJProxy(objsys_idx, OBJ_INTERFACE_ID.BDETECT_ID, mGage.mGMRenZiJiaFix.mPDetect);
+            bDetectOBJProxy = new BlowingDetect_OBJProxy(objsys_idx, OBJ_INTERFACE_ID.BDETECT_ID, mGage.gmRenZiJiaFix.mPDetect);
 
-            scanWarningOBJProxy = new ScanWarning_OBJProxy(objsys_idx, OBJ_INTERFACE_ID.SCANWARNING_ID, mGage.mScanWarning);
+            scanWarningOBJProxy = new ScanWarning_OBJProxy(objsys_idx, OBJ_INTERFACE_ID.SCANWARNING_ID, mGage.scanWarning);
 
-            bulkDbOBJProxy = new BulkDB_OBJProxy(objsys_idx, OBJ_INTERFACE_ID.BULKDB_ID, mGage.mBulkDb);
+            bulkDbOBJProxy = new BulkDB_OBJProxy(objsys_idx, OBJ_INTERFACE_ID.BULKDB_ID, mGage.bulkDb);
 
-            warnSystemOBJProxy = new FLY.OBJComponents.Server.OBJProxy.WarningSystem_OBJProxy(objsys_idx, OBJ_INTERFACE_ID.WARNING_OBJ_ID, mGage.mWarning);
+            warnSystemOBJProxy = new FLY.OBJComponents.Server.OBJProxy.WarningSystem_OBJProxy(objsys_idx, OBJ_INTERFACE_ID.WARNING_OBJ_ID, mGage.warning);
 
             jsonDist_OBJProxy = new JsonDist_OBJProxy(objsys_idx, OBJ_INTERFACE_ID.JSONDIST_OBJ_ID, new JsonDist());
 
             blowingOBJProxy.CurrObjSys.Start_Conn_Server(
-                mGage.mSysParam.LocalEP,
+                mGage.sysParam.LocalEP,
                 bulkDataOBJProxy.ID);
         }
     }

Project.FLY.Thick.BlowingScan/FLY.Thick.BlowingScan.UI.Server/MainWindow.xaml.cs

@@ -42,7 +42,7 @@ namespace FLY.Thick.BlowingScan.UI.Server
 
             FObjBase.PollModule.Current.Start();
 
-            this.DataContext = mGage.mSysParam;
+            this.DataContext = mGage.sysParam;
         }
     }
 }

Project.FLY.Thick.BlowingScan/FLY.Thick.BlowingScan/Server.OBJProxy/OBJProxys.cs

@@ -46,30 +46,30 @@ namespace FLY.Thick.BlowingScan.Server.OBJProxy
         public OBJProxys(int objsys_idx, TDGage gage)
         {
             TDGage mGage = gage;
-            mBulkDataOBJProxy = new BulkDataService_OBJProxy(objsys_idx, OBJ_INTERFACE_ID.BULK_ID, mGage.mBulk);
+            mBulkDataOBJProxy = new BulkDataService_OBJProxy(objsys_idx, OBJ_INTERFACE_ID.BULK_ID, mGage.bulk);
 
 
-            mProfileOBJProxy = new BlowingProfile_OBJProxy(objsys_idx, OBJ_INTERFACE_ID.PROFILE_ID, mGage.mProfile);
+            mProfileOBJProxy = new BlowingProfile_OBJProxy(objsys_idx, OBJ_INTERFACE_ID.PROFILE_ID, mGage.profile);
 
-            mBorderSearchOBJProxy = new BorderSearch_OBJProxy(objsys_idx, OBJ_INTERFACE_ID.BORDERSEARCH_ID, mGage.mBorderSearch);
+            mBorderSearchOBJProxy = new BorderSearch_OBJProxy(objsys_idx, OBJ_INTERFACE_ID.BORDERSEARCH_ID, mGage.borderSearch);
             
-            mCurveOBJProxy = new Curve_OBJProxy(objsys_idx, OBJ_INTERFACE_ID.CURVE_ID, mGage.mCurve);
+            mCurveOBJProxy = new Curve_OBJProxy(objsys_idx, OBJ_INTERFACE_ID.CURVE_ID, mGage.curve);
 
-            mDynAreaOBJProxy = new DynArea_OBJProxy(objsys_idx, OBJ_INTERFACE_ID.DYNAREA_ID, mGage.mDynArea);
+            mDynAreaOBJProxy = new DynArea_OBJProxy(objsys_idx, OBJ_INTERFACE_ID.DYNAREA_ID, mGage.dynArea);
 
-            mGetSampleOBJProxy = new GetSample_OBJProxy(objsys_idx, OBJ_INTERFACE_ID.GET_SAMPLE_ID, mGage.mGetSample);
+            mGetSampleOBJProxy = new GetSample_OBJProxy(objsys_idx, OBJ_INTERFACE_ID.GET_SAMPLE_ID, mGage.getSample);
 
-            mInitParamOBJProxy = new Initparam_OBJProxy(objsys_idx, OBJ_INTERFACE_ID.INITPARAM_ID, mGage.mInitParam);
+            mInitParamOBJProxy = new Initparam_OBJProxy(objsys_idx, OBJ_INTERFACE_ID.INITPARAM_ID, mGage.initParam);
 
-            mScanCorrOBJProxy = new ScanCorr_OBJProxy(objsys_idx, OBJ_INTERFACE_ID.SCANCORR_ID, mGage.mGMScanCorr);
+            mScanCorrOBJProxy = new ScanCorr_OBJProxy(objsys_idx, OBJ_INTERFACE_ID.SCANCORR_ID, mGage.gmScanCorr);
 
-            mFlyADOBJProxy = new FlyAD_OBJProxy(objsys_idx, OBJ_INTERFACE_ID.FLYAD_ID, mGage.mFlyAD, mGage.AD2Thick);
+            mFlyADOBJProxy = new FlyAD_OBJProxy(objsys_idx, OBJ_INTERFACE_ID.FLYAD_ID, mGage.flyAd, mGage.AD2Thick);
 
-            mGageInfoOBJProxy = new GageInfo_OBJProxy(objsys_idx, OBJ_INTERFACE_ID.GAGEINFO_ID , mGage.mGMGageInfo);
+            mGageInfoOBJProxy = new GageInfo_OBJProxy(objsys_idx, OBJ_INTERFACE_ID.GAGEINFO_ID , mGage.gmGageInfo);
 
-            mFixOBJProxy = new Fix_OBJProxy(objsys_idx, OBJ_INTERFACE_ID.FIX_ID, mGage.mGMFix);
+            mFixOBJProxy = new Fix_OBJProxy(objsys_idx, OBJ_INTERFACE_ID.FIX_ID, mGage.gmFix);
 
-            mWarnSystemOBJProxy = new FLY.OBJComponents.Server.OBJProxy.WarningSystem_OBJProxy(objsys_idx, OBJ_INTERFACE_ID.WARNING_OBJ_ID, mGage.mWarning);
+            mWarnSystemOBJProxy = new FLY.OBJComponents.Server.OBJProxy.WarningSystem_OBJProxy(objsys_idx, OBJ_INTERFACE_ID.WARNING_OBJ_ID, mGage.warning);
 
             jsonDist_OBJProxy = new JsonDist_OBJProxy(objsys_idx, OBJ_INTERFACE_ID.JSONDIST_OBJ_ID, new JsonDist());
 
@@ -77,17 +77,17 @@ namespace FLY.Thick.BlowingScan.Server.OBJProxy
 
             mTDGageOBJProxy = new TDGage_OBJProxy(objsys_idx, OBJ_INTERFACE_ID.TDGAGE_ID, mGage);
 
-            mBlowingOBJProxy = new BlowingScan_OBJProxy(objsys_idx, OBJ_INTERFACE_ID.RENZIJIA_ID, mGage.mGMRenZiJiaScan);
+            mBlowingOBJProxy = new BlowingScan_OBJProxy(objsys_idx, OBJ_INTERFACE_ID.RENZIJIA_ID, mGage.gmRenZiJiaScan);
 
-            mBDetectOBJProxy = new BlowingDetect_OBJProxy(objsys_idx, OBJ_INTERFACE_ID.BDETECT_ID, mGage.mGMRenZiJiaScan.mPDetect);
+            mBDetectOBJProxy = new BlowingDetect_OBJProxy(objsys_idx, OBJ_INTERFACE_ID.BDETECT_ID, mGage.gmRenZiJiaScan.mPDetect);
 
-            mScanWarningOBJProxy = new ScanWarning_OBJProxy(objsys_idx, OBJ_INTERFACE_ID.SCANWARNING_ID, mGage.mScanWarning);
+            mScanWarningOBJProxy = new ScanWarning_OBJProxy(objsys_idx, OBJ_INTERFACE_ID.SCANWARNING_ID, mGage.scanWarning);
 
-            mBulkDBOBJProxy = new BulkDB_OBJProxy(objsys_idx, OBJ_INTERFACE_ID.BULKDB_ID, mGage.mBulkDb);
+            mBulkDBOBJProxy = new BulkDB_OBJProxy(objsys_idx, OBJ_INTERFACE_ID.BULKDB_ID, mGage.bulkDb);
 
 
             mTDGageOBJProxy.CurrObjSys.Start_Conn_Server(
-                mGage.mSysParam.LocalEP,
+                mGage.sysParam.LocalEP,
                 mBulkDataOBJProxy.ID);
         }
     }

Project.FLY.Weight/FLY.Weight.UI.Client/WeighterColorDB.cs

@@ -26,9 +26,9 @@ namespace FLY.Weight.UI.Client
         {
 
 
-            if (File.Exists("weighterColorDb.json"))
+            if (File.Exists("default/weighterColorDb.json"))
             {
-                string json = File.ReadAllText("weighterColorDb.json");
+                string json = File.ReadAllText("default/weighterColorDb.json");
                 mWeighters = Newtonsoft.Json.JsonConvert.DeserializeObject<Dictionary<string, WeighterColor>>(json);
             }
             else 

Project.FLY.Weight/FLY.Weight/Client/WeightSystemServiceClient.cs

@@ -65,10 +65,9 @@ namespace FLY.Weight.Client
             Init();
         }
         public WeightSystemServiceClient(UInt32 serviceId, string connName) : base(serviceId) {
-            Init();
             ConnName = connName;
             filePath = connName + "." +filePath;
-
+            Init();
             FObjServiceClientManager.Instance.Connect_to_Another_OBJSys(connName, this);
         }
 

thick_public @ 88b4c13d

-Subproject commit 715ebee61130332971fcac03421f62bc114bb015
+Subproject commit 88b4c13d3d404a1c744118f13918d63f2082d13a