Commits · d0ce3d43fa5f524b6a0b02e2ed085f893573ff2f · 陈伟灿 / k-sdk

15 Feb, 2022 1 commit
- 【修改内容】修改场景rebuild存在的问题 · d0ce3d43
  chen.weican authored Feb 15, 2022
```
【提交人】陈伟灿
```
  d0ce3d43
14 Feb, 2022 2 commits
- Merge branch 'cwc' into 'master' · 159981b9
  陈伟灿 authored Feb 14, 2022
```
【修改内容】修改NX5编译不通过的BUG

See merge request chenweican/k-sdk!187
```
  159981b9
- 【修改内容】修改NX5编译不通过的BUG · 6b769f38
  chen.weican authored Feb 14, 2022
```
【提交人】陈伟灿
```
  6b769f38
12 Feb, 2022 4 commits
- Merge branch 'cwc' into 'master' · 0b3af3e9
  陈伟灿 authored Feb 12, 2022
```
【修改内容】修改空调内机房间待分配问题

See merge request chenweican/k-sdk!186
```
  0b3af3e9
- 【修改内容】修改空调内机房间待分配问题 · 7a3ff60f
  chen.weican authored Feb 12, 2022
```
【提交人】陈伟灿
```
  7a3ff60f
- Merge branch 'hzl' into 'master' · d304a5d8
  陈伟灿 authored Feb 12, 2022
```
1.更新最新的gw库20220211

See merge request chenweican/k-sdk!185
```
  d304a5d8
- 1.更新最新的gw库20220211 · a9d27dbe
  黄振令 authored Feb 12, 2022
  
  a9d27dbe
11 Feb, 2022 7 commits
- Merge branch 'cwc' into 'master' · b46e8c98
  陈伟灿 authored Feb 11, 2022
```
【修改内容】3028tsl文件修改；窗帘绑定修改

See merge request chenweican/k-sdk!184
```
  b46e8c98
- 【修改内容】3028tsl文件修改；窗帘绑定修改 · 29dc40f7
  chen.weican authored Feb 11, 2022
```
【提交人】陈伟灿
```
  29dc40f7
- Merge branch 'hzl' into 'master' · b1be5f3f
  陈伟灿 authored Feb 11, 2022
```
1.nx5编译不过问题

See merge request chenweican/k-sdk!183
```
  b1be5f3f
- 1.nx5编译不过问题 · 7f464c41
  黄振令 authored Feb 11, 2022
  
  7f464c41
- Merge branch 'hzl' into 'master' · 56e549ce
  陈伟灿 authored Feb 11, 2022
```
Hzl

See merge request chenweican/k-sdk!182
```
  56e549ce
- Merge branch 'master' of http://172.17.3.10:17001/chenweican/k-sdk · 48e61b05
  黄振令 authored Feb 11, 2022
  
  48e61b05
- 1.增加编译选项支持android ndk的库；2.android ndk 打包的库；3.修改中控配置文件路径可修改；4.ndk编译出来都是so库 · 80fb2deb
  黄振令 authored Feb 11, 2022
  
  80fb2deb
25 Jan, 2022 2 commits
- Merge branch 'yjq' into 'master' · f533957b
  陈伟灿 authored Jan 25, 2022
```
kk_lan 1003杜亚窗帘特别处理(opcode：DOOYA_STATUS)

See merge request chenweican/k-sdk!181
```
  f533957b
- kk_lan 1003杜亚窗帘特别处理(opcode：DOOYA_STATUS) · 466ee3d8
  尹佳钦 authored Jan 25, 2022
  
  466ee3d8
24 Jan, 2022 2 commits
- Merge branch 'cwc' into 'master' · 0713cd61
  陈伟灿 authored Jan 24, 2022
```
【修改内容】1，修改已创建的场景，设备移动到待分配后，场景仍然执行

See merge request chenweican/k-sdk!180
```
  0713cd61
- 【修改内容】1，修改已创建的场景，设备移动到待分配后，场景仍然执行 · b512d951
  chen.weican authored Jan 24, 2022
```
【提交人】陈伟灿
```
  b512d951
20 Jan, 2022 2 commits
- Merge branch 'cwc' into 'master' · 271cd502
  陈伟灿 authored Jan 20, 2022
```
【修改内容】修改a133平台ccuid获取方式

See merge request chenweican/k-sdk!179
```
  271cd502
- 【修改内容】修改a133平台ccuid获取方式 · 80b88e71
  chen.weican authored Jan 20, 2022
```
【提交人】陈伟灿
```
  80b88e71
19 Jan, 2022 4 commits
- Merge branch 'cwc' into 'master' · 97845c72
  陈伟灿 authored Jan 19, 2022
```
【修改内容】设备强制退网后中控端保留数据修改

See merge request chenweican/k-sdk!178
```
  97845c72
- 【修改内容】设备强制退网后中控端保留数据修改 · d2e01e55
  chen.weican authored Jan 19, 2022
```
【提交人】陈伟灿
```
  d2e01e55
- Merge branch 'cwc' into 'master' · 00eeb130
  陈伟灿 authored Jan 19, 2022
```
【修改内容】1，增加空调网关的online offline 处理；2，调整发现线程，采用select

See merge request chenweican/k-sdk!177
```
  00eeb130
- 【修改内容】1，增加空调网关的online offline 处理；2，调整发现线程，采用select · 067ec46c
  chen.weican authored Jan 19, 2022
```
【提交人】陈伟灿
```
  067ec46c
18 Jan, 2022 7 commits
- Merge branch 'cwc' into 'master' · bdee3f61
  陈伟灿 authored Jan 18, 2022
```
【修改内容】修改版本为1.4.3

See merge request chenweican/k-sdk!176
```
  bdee3f61
- 【修改内容】修改版本为1.4.3 · 166c1c58
  chen.weican authored Jan 18, 2022
```
【提交人】陈伟灿
```
  166c1c58
- Merge branch 'yjq' into 'master' · b670d792
  陈伟灿 authored Jan 18, 2022
```
kk_lan新增get ccu info

See merge request chenweican/k-sdk!174
```
  b670d792
- Merge branch 'master' into 'yjq' · fdcba0f7
  陈伟灿 authored Jan 18, 2022
```
# Conflicts:
#   midware/midware/midware.c
```
  fdcba0f7
- kk_lan新增get ccu info · 5880d2e5
  尹佳钦 authored Jan 18, 2022
  
  5880d2e5
- Merge branch 'cwc' into 'master' · e3f9bf9d
  陈伟灿 authored Jan 18, 2022
```
【修改内容】修改空调网关因没有内机导致同步死机的BUG

See merge request chenweican/k-sdk!175
```
  e3f9bf9d
- 【修改内容】修改空调网关因没有内机导致同步死机的BUG · 3057a861
  chen.weican authored Jan 18, 2022
```
【提交认】陈伟灿
```
  3057a861
14 Jan, 2022 2 commits
- Merge branch 'cwc' into 'master' · 4f152160
  陈伟灿 authored Jan 14, 2022
```
【修改内容】1，修改网关名字同步后显示不正常的BUG；2，修改快照上报不触发IFTT

See merge request chenweican/k-sdk!173
```
  4f152160
- 【修改内容】1，修改网关名字同步后显示不正常的BUG；2，修改快照上报不触发IFTT · 7e4db009
  chen.weican authored Jan 14, 2022
```
【提交人】陈伟灿
```
  7e4db009
12 Jan, 2022 2 commits
- Merge branch 'cwc' into 'master' · e58f0462
  陈伟灿 authored Jan 12, 2022
```
【修改内容】增加局域网功能相关配置

See merge request chenweican/k-sdk!172
```
  e58f0462
- 【修改内容】增加局域网功能相关配置 · 8e5214a7
  chen.weican authored Jan 12, 2022
```
【提交人】陈伟灿
```
  8e5214a7
11 Jan, 2022 2 commits
- Merge branch 'cwc' into 'master' · f0c47ef2
  陈伟灿 authored Jan 11, 2022
```
【修改内容】1，调整a133数据库存放位置；2，增加取消报警声的功能

See merge request chenweican/k-sdk!171
```
  f0c47ef2
- 【修改内容】1，调整a133数据库存放位置；2，增加取消报警声的功能 · 91c19022
  chen.weican authored Jan 11, 2022
```
【提交人】陈伟灿
```
  91c19022
10 Jan, 2022 3 commits
- Merge branch 'cwc' into 'master' · b73ec4c5
  陈伟灿 authored Jan 10, 2022
```
【修改内容】增加窗帘绑定功能

See merge request chenweican/k-sdk!170
```
  b73ec4c5
- 【修改内容】增加窗帘绑定功能 · 23b72caf
  chen.weican authored Jan 10, 2022
```
【提交人】陈伟灿
```
  23b72caf
- Merge branch 'cwc' into 'master' · 4ed8fa53
  陈伟灿 authored Jan 10, 2022
```
【修改内容】增加调光灯系列相关配置

See merge request chenweican/k-sdk!168
```
  4ed8fa53