Commits · 4a487a06be546c1b5d258d9cce0dde5c1265d686 · 潘栩锋 / Thick-Common

24 Mar, 2020 3 commits
- 1. · 4a487a06
  潘栩锋 authored Mar 24, 2020
```
Merge remote-tracking branch 'origin/feature-AdvTrendData-20191123' into dev6.0

2. getsample界面通过容器获取gageinfo
```
  4a487a06
- 添加 xmind 转 unity 配置文件项目 · 419b7d69
  潘栩锋 authored Mar 24, 2020
  
  419b7d69
- 1. 定点图配置添加密码 · 03f200e5
  潘栩锋 authored Mar 24, 2020
```
2. 报警大提示框，改为扫描报警大提示框
```
  03f200e5
21 Mar, 2020 2 commits
- Merge branch 'dev6.0' of http://private.flyautomation.net:82/panruising/thick_public into dev6.0 · 5d631bd5
  潘栩锋 authored Mar 21, 2020
  
  5d631bd5
- 修改报警界面字体为16pix · e1cebe18
  潘栩锋 authored Mar 21, 2020
  
  e1cebe18
20 Mar, 2020 2 commits
- 查看全部报警，添加换行颜色 · 98912f44
  潘栩锋 authored Mar 20, 2020
  
  98912f44
- 本来想添加多级绑定功能，像Binding 一样。但GetValue( obj, new object[]{index}); 失败。放弃！ · d04a2661
  潘栩锋 authored Mar 20, 2020
  
  d04a2661
19 Mar, 2020 5 commits
- Merge branch 'dev6.0' of http://private.flyautomation.net:82/panruising/thick_public into dev6.0 · 3d9c1da0
  潘栩锋 authored Mar 19, 2020
  
  3d9c1da0
- 定点图不会显示 · d91e9ad3
  潘栩锋 authored Mar 19, 2020
  
  d91e9ad3
- Merge branch 'dev6.0' of http://private.flyautomation.net:82/panruising/thick_public into dev6.0 · d1932ec2
  潘栩锋 authored Mar 19, 2020
  
  d1932ec2
- 删除CoatingSegmentSearch.cs · a17be063
  潘栩锋 authored Mar 19, 2020
  
  a17be063
- 地址与密码添加默认值功能。放在 default 文件夹 · 718601f2
  潘栩锋 authored Mar 19, 2020
  
  718601f2
18 Mar, 2020 5 commits
- 加载前，等1000ms · ee279be4
  潘栩锋 authored Mar 18, 2020
  
  ee279be4
- 整理 FOBJ 代理，多余的删除 · 634c9abe
  潘栩锋 authored Mar 18, 2020
  
  634c9abe
- 添加Address 密码 · e93197eb
  潘栩锋 authored Mar 18, 2020
  
  e93197eb
- Bulkdata解析出错时，不动作 · a8a6267a
  潘栩锋 authored Mar 18, 2020
  
  a8a6267a
- ObjServiceClientManager 创建objClient时，没有地址，创建连接到0.0.0.1:12345, 不可能存在的地址。避免通讯出错 · a18c543c
  潘栩锋 authored Mar 18, 2020
  
  a18c543c
14 Mar, 2020 2 commits
- Merge remote-tracking branch 'remotes/origin/master' into dev6.0 · 60be6282
  潘栩锋 authored Mar 14, 2020
  
  60be6282
- 添加 ResetAction, 按钮按下与复位绑定功能 · 46208651
  潘栩锋 authored Mar 14, 2020
  
  46208651
12 Mar, 2020 1 commit
- 比较完善的 MultiLayout · 850d97c6
  潘栩锋 authored Mar 12, 2020
  
  850d97c6
08 Mar, 2020 1 commit
- 修复 SyncPropServiceClient 当客户端没有对应 ObjName 时的出错 · a33678ba
  潘栩锋 authored Mar 08, 2020
  
  a33678ba
07 Mar, 2020 3 commits
- 边界查找，没有任何数据输入，会报警提示 · bf850c30
  潘栩锋 authored Mar 07, 2020
  
  bf850c30
- 可以的AD盒界面设置是否使用电脑计算速度，因为当前AD盒推送的速度都是偏小很多 · 55a18e0d
  潘栩锋 authored Mar 07, 2020
  
  55a18e0d
- 修改取样的滤波方法，使用时间滤波。界面添加查看原始AD 与滤波后的AD · 23d8f843
  潘栩锋 authored Mar 07, 2020
  
  23d8f843
05 Mar, 2020 1 commit
- PLC 线圈报警只能 On时报警。修改ModbusMapper BOOL 放大功能，scale=-1，使BOOL反向。实现Off时报警。 · fa1cdf1e
  潘栩锋 authored Mar 05, 2020
```
这个功能能通过 plcgroup.json 文件加载后，动态修改
```
  fa1cdf1e
02 Mar, 2020 2 commits
- FilmPositionDetect 服务远程通讯 · 58cc4b86
  潘栩锋 authored Mar 02, 2020
  
  58cc4b86
- IBoltMapService 添加注解 · 35705dbc
  潘栩锋 authored Mar 02, 2020
  
  35705dbc
01 Mar, 2020 5 commits
- 添加 MenuProfile,MenuSetting 模板 · 4559d669
  潘栩锋 authored Mar 01, 2020
  
  4559d669
- DynAreaThick · 4e7ef69c
  潘栩锋 authored Mar 01, 2020
  
  4e7ef69c
- Merge branch 'dev6.0' of http://private.flyautomation.net:82/panruising/thick_public into dev6.0 · 17986052
  潘栩锋 authored Mar 01, 2020
  
  17986052
- 为了扫描图扩展 public virtual void MatchParam(int[] IDs) · 0cd152bd
  潘栩锋 authored Mar 01, 2020
  
  0cd152bd
- 添加 UiModul/DynAreaThick · f866cdb1
  潘栩锋 authored Mar 01, 2020
  
  f866cdb1
29 Feb, 2020 5 commits
- BulkData 满足 unity需求 · ec9702ab
  潘栩锋 authored Feb 29, 2020
  
  ec9702ab
- Merge remote-tracking branch 'remotes/origin/feature-feng-double-20191211' into dev6.0 · 4d3c1635
  潘栩锋 authored Feb 29, 2020
  
  4d3c1635
- 重新添加FLY.Thick.BulkData · 4c2d587b
  潘栩锋 authored Feb 29, 2020
  
  4c2d587b
- 添加 FLY.Thick.Base.UI/UiModule · 89bd1af2
  潘栩锋 authored Feb 29, 2020
  
  89bd1af2
- 支持unity · 4865a4ad
  潘栩锋 authored Feb 29, 2020
  
  4865a4ad
27 Feb, 2020 1 commit
- 修改bug 报警声文件没有，会出错 · ceaf9a32
  潘栩锋 authored Feb 27, 2020
  
  ceaf9a32
26 Feb, 2020 2 commits
- Merge remote-tracking branch 'origin/feature-feng-integrated-20200210' · c48adad7
  潘栩锋 authored Feb 26, 2020
```
# Conflicts:
#	Project.FLY.Thick.Base/FLY.Thick.Base.UI/FLY.Thick.Base.UI.csproj
```
  c48adad7
- 1. 全部使用 mahapp.metro.iconpacks.material · 780c96d8
  潘栩锋 authored Feb 26, 2020
```
2. PLC 报警配置，添加 XXX PLC连接断开， XXX可自定义
```
  780c96d8