Open
Conversation
1、设备发现只处理佳信捷和迪智普SDK; 2、设备登陆、设备搜索测试了佳信捷SDK;
2、完成了将海康SDK中将文件信息写入到JSON文件的功能 3、完成了将海康SDK中将文件信息写入到数据库中的功能
2、增加了SDK的公共头文件以及对一些接口进行修改。
2、将海康和大华的SDK的共用头文件分离开来。 3、修改业务中视频文件查询的接口。
1、将各Vendor头文件中有关的各自底层sdk相关的变量、函数移植到相应的cpp文件，解决之前不同sdk厂商使用相似头文件造成重定义的问题； 2、取消使用各自sdk厂商生成静态库lib的方法，回复到之前类的方式调用各自sdk的方法
1、将各Vendor头文件中有关的各自底层sdk相关的变量、函数移植到相应的cpp文件，解决之前不同sdk厂商使用相似头文件造成重定义的问题； 2、取消使用各自sdk厂商生成静态库lib的方法，回复到之前类的方式调用各自sdk的方法
1、使用责任链的设计模式，在Device类中增加相应责任链机制，完成“循环登陆扫描设备”的功能，连续sdk登陆有登陆时的错误，该问题在验证；
1、增加“有设备发现功能”和“没有设备发现功能”的流程，实现获取到目前已做的4个SDK的设备数量及相关信息的功能，其中佳信捷、迪智普、大华等SDK有设备发现功能，海康SDK没有设备发现功能； 2、合并之前的“设备管理类DeviceManager”到“设备登陆类LoginDevice”中，统一管理登陆成功的设备（有别于设备发现阶段的试探性登陆）；
1、整合童磊的文件搜索类SearchVideo，梳理流程 “设备发现-设备登陆-文件搜索”；
2、完善文件下载的部分功能。
commit 8eb1253 Author: TongLei <[email protected]> Date: Mon Jul 18 17:51:32 2016 +0800 Squashed commit of the following: commit 769067e Author: zhoujiechj <[email protected]> Date: Thu Jul 14 18:19:04 2016 +0800 完善 “设备发现”、“设备登陆” 业务流程，新增 “设备管理” 业务： 1、“设备发现” 将之前的阻塞型改为非阻塞型，即使用Poco库的线程池，管理“设备发现”业务类； 2、“设备登陆” 业务增加“登陆设备时写设备信息到数据库，登出设备则从数据库删除设备设备信息”，用于“当主程序退出时，重新开启程序可以自动重新登陆之前已登陆的设备的情况”； 3、新增 “设备管理” 业务，即完成第2条中说的“自动重新登陆”的功能，包括“程序重新登陆上次退出程序时已登陆设备”和“重新登陆断开连接的设备”的功能 commit 7b484ef Author: zhoujiechj <[email protected]> Date: Tue Jul 12 21:26:27 2016 +0800 新增 “设备搜索” 线程轮询部分 commit 51be435 Author: zhoujiechj <[email protected]> Date: Mon Jul 11 20:10:46 2016 +0800 测试下载文件回调函数的 “消息通知” 功能 commit 2d7c5a8 Author: zhoujiechj <[email protected]> Date: Fri Jul 8 11:12:17 2016 +0800 修改jxj SDK 类名CJxjVendor 为 CJXJVendor commit 0d37b76 Author: zhoujiechj <[email protected]> Date: Fri Jul 8 10:45:16 2016 +0800 设备发现、设备登陆、文件搜索 合并 commit c619632 Author: zhoujiechj <[email protected]> Date: Thu Jul 7 20:59:32 2016 +0800 完善 “文件播放” 测试部分 commit 33e5129 Author: zhoujiechj <[email protected]> Date: Thu Jul 7 17:56:22 2016 +0800 测试 “文件搜索” 业务流程： 1、整合童磊的文件搜索类SearchVideo，梳理流程 “设备发现-设备登陆-文件搜索”； commit d0b1a26 Author: zhoujiechj <[email protected]> Date: Thu Jul 7 16:11:17 2016 +0800 完善 “设备发现和设备登陆” 业务流程： 1、增加“有设备发现功能”和“没有设备发现功能”的流程，实现获取到目前已做的4个SDK的设备数量及相关信息的功能，其中佳信捷、迪智普、大华等SDK有设备发现功能，海康SDK没有设备发现功能； 2、合并之前的“设备管理类DeviceManager”到“设备登陆类LoginDevice”中，统一管理登陆成功的设备（有别于设备发现阶段的试探性登陆）； commit b6aefcb Author: zhoujiechj <[email protected]> Date: Wed Jul 6 20:12:50 2016 +0800 完善 “设备发现中的循环登陆扫描设备” 部分： 1、使用责任链的设计模式，在Device类中增加相应责任链机制，完成“循环登陆扫描设备”的功能，连续sdk登陆有登陆时的错误，该问题在验证； commit 4b4c160 Author: zhoujiechj <[email protected]> Date: Wed Jul 6 17:19:13 2016 +0800 合并 大华、海康SDK（漏掉一些新增文件）： 1、将各Vendor头文件中有关的各自底层sdk相关的变量、函数移植到相应的cpp文件，解决之前不同sdk厂商使用相似头文件造成重定义的问题； 2、取消使用各自sdk厂商生成静态库lib的方法，回复到之前类的方式调用各自sdk的方法 commit ce5d47d Author: zhoujiechj <[email protected]> Date: Wed Jul 6 17:10:27 2016 +0800 合并 大华、海康SDK： 1、将各Vendor头文件中有关的各自底层sdk相关的变量、函数移植到相应的cpp文件，解决之前不同sdk厂商使用相似头文件造成重定义的问题； 2、取消使用各自sdk厂商生成静态库lib的方法，回复到之前类的方式调用各自sdk的方法 commit 31e2973 Author: zhoujiechj <[email protected]> Date: Tue Jul 5 20:29:02 2016 +0800 新增部分 “轮循登陆查找设备” 的功能 commit 4c227b9 Author: zhoujiechj <[email protected]> Date: Tue Jul 5 17:00:46 2016 +0800 梳理 “设备发现”、“设备登陆” 业务流程 commit e49ec98 Author: zhoujiechj <[email protected]> Date: Mon Jul 4 19:56:23 2016 +0800 1、将佳信捷SDK和迪智普SDK生产静态库JXJVendor.lib和DZPVendor.lib，解决sdk头文件中结构体或者函数重定义的问题； 2、完善各SDK头文件引用； commit 2dbc034 Author: zhoujiechj <[email protected]> Date: Sat Jul 2 16:02:49 2016 +0800 新增“设备发现”、“设备登陆”、“设备搜索”的业务流程： 1、设备发现只处理佳信捷和迪智普SDK; 2、设备登陆、设备搜索测试了佳信捷SDK; commit 832b6fa Author: zhoujiechj <[email protected]> Date: Sat Jul 2 10:39:27 2016 +0800 新增 佳信捷和迪智普SDK合并文件清单.txt commit 338e716 Author: zhoujiechj <[email protected]> Date: Fri Jul 1 22:24:30 2016 +0800 新增已有设备搜索流程 commit fc73567 Author: zhoujiechj <[email protected]> Date: Thu Jun 30 21:17:02 2016 +0800 新增迪智浦SDK 搜索、下载 接口 # Conflicts: # TRobot/Robot/AbstractVendor.h # TRobot/Robot/CommonUtrl.cpp # TRobot/Robot/CommonUtrl.h # TRobot/Robot/DHVendor.h # TRobot/Robot/DHVendor/DHVendor.cpp # TRobot/Robot/DHsdk/IvsDrawer.dll # TRobot/Robot/DHsdk/aacdec.dll # TRobot/Robot/DHsdk/amrdec.dll # TRobot/Robot/DHsdk/dhconfigsdk.dll # TRobot/Robot/DHsdk/dhnetsdk.dll # TRobot/Robot/DHsdk/dhplay.dll # TRobot/Robot/DHsdk/h264dec.dll # TRobot/Robot/DHsdk/mjpegdec.dll # TRobot/Robot/DHsdk/mp3dec.dll # TRobot/Robot/DHsdk/mpeg4dec.dll # TRobot/Robot/DZPVendor/DZPVendor.cpp # TRobot/Robot/DZPVendor/DZPVendor.h # TRobot/Robot/Device.cpp # TRobot/Robot/Device.h # TRobot/Robot/JxjVendor/JxjVendor.cpp # TRobot/Robot/JxjVendor/JxjVendor.h # TRobot/Robot/Robot.cpp # TRobot/Robot/Robot.vcxproj # TRobot/Robot/Robot.vcxproj.filters # TRobot/Robot/SearchFileList.config # TRobot/Robot/x86/dhnetsdk.h commit 63bcd30 Author: TongLei <[email protected]> Date: Mon Jul 18 16:06:49 2016 +0800 1、删除测试文件。 commit 4746505 Author: TongLei <[email protected]> Date: Mon Jul 18 16:03:44 2016 +0800 1、优化了SDK中的代码。 commit b14143f Author: TongLei <[email protected]> Date: Mon Jul 18 09:43:15 2016 +0800 1、删除了HK处理文件名相同的函数。 commit afaf768 Author: TongLei <[email protected]> Date: Fri Jul 15 19:29:52 2016 +0800 1、在海康里面增加了文件重复过滤的功能。 2、将视频查询中上报给UI次数的位置由SDK中修改到业务中。 commit 0e963d6 Author: TongLei <[email protected]> Date: Fri Jul 15 18:52:30 2016 +0800 1、对海康的文件路径进行修改。 2、修复了文件查询业务中取消文件失败的BUG commit 444fcbf Author: TongLei <[email protected]> Date: Fri Jul 15 13:51:35 2016 +0800 1、更新大华SDK的DLL commit 10d2849 Merge: eb3b261 de003d9 Author: TongLei <[email protected]> Date: Fri Jul 15 10:13:34 2016 +0800 Merge remote-tracking branch 'remotes/origin/master' into Tong_Lei commit eb3b261 Author: TongLei <[email protected]> Date: Fri Jul 15 10:01:40 2016 +0800 1、把不需要的文件删除。 commit de003d9 Merge: 1ef7c38 cbc558e Author: kenny zhang <[email protected]> Date: Fri Jul 15 09:55:48 2016 +0800 Merge pull request #78 from anyboo/transation Transation commit cbc558e Author: mk-z <[email protected]> Date: Fri Jul 15 09:54:25 2016 +0800 修改数据库使用说明 commit b9a71bd Author: mk-z <[email protected]> Date: Fri Jul 15 09:47:28 2016 +0800 加入数据库异常处理 commit 21b65da Author: TongLei <[email protected]> Date: Thu Jul 14 19:08:02 2016 +0800 1、修改了大华SDK中文件路径的问题。 2、修改了视频文件查询的结构。 commit 1ef7c38 Merge: 5637a4f 6e6619a Author: kenny zhang <[email protected]> Date: Thu Jul 14 18:04:57 2016 +0800 Merge pull request #77 from anyboo/transation 端口扫描类和调用说明 commit 6e6619a Author: mk-z <[email protected]> Date: Thu Jul 14 18:02:46 2016 +0800 端口扫描类和调用说明 commit 5637a4f Merge: 77455a2 3b09634 Author: kenny zhang <[email protected]> Date: Thu Jul 14 11:46:45 2016 +0800 Merge pull request #76 from anyboo/transation 添加文件数据库，修改数据库说明，内存数据库单例模式修改 commit 3b09634 Author: mk-z <[email protected]> Date: Thu Jul 14 10:58:40 2016 +0800 添加文件数据库，修改数据库说明，内存数据库单例模式修改 commit 6212e85 Author: TongLei <[email protected]> Date: Thu Jul 14 09:06:39 2016 +0800 完成视频文件查询的基本流程。 commit 77455a2 Merge: a932ee3 5aa5749 Author: kenny zhang <[email protected]> Date: Wed Jul 13 14:31:25 2016 +0800 Merge pull request #75 from anyboo/transation 修改插入数据库慢的问题 commit 5aa5749 Author: mk-z <[email protected]> Date: Wed Jul 13 14:27:49 2016 +0800 修改插入数据库慢的问题 commit 5a93d06 Author: TongLei <[email protected]> Date: Tue Jul 12 21:25:42 2016 +0800 完成了单文件下载的功能。 commit a932ee3 Merge: 4f01163 7da0118 Author: kenny zhang <[email protected]> Date: Tue Jul 12 17:47:17 2016 +0800 Merge pull request #74 from anyboo/transation Transation commit 7da0118 Author: mk-z <[email protected]> Date: Tue Jul 12 17:45:23 2016 +0800 修改命名空间的问题 commit 68fd5c3 Author: mk-z <[email protected]> Date: Tue Jul 12 17:16:22 2016 +0800 完成端口扫描模块代码 commit 475bdac Author: TongLei <[email protected]> Date: Tue Jul 12 14:53:18 2016 +0800 添加了视频下载模块的输出接口 commit 5be8a40 Author: TongLei <[email protected]> Date: Mon Jul 11 20:13:24 2016 +0800 1、实现了将SDK中得到的文件大小以及总文件大小发送到视频下载的业务层。 2、完善文件下载的部分功能。 commit 55a8039 Author: mk-z <[email protected]> Date: Mon Jul 11 20:07:32 2016 +0800 端口扫描完整代码，但有错误未修改 commit c6999b0 Author: TongLei <[email protected]> Date: Mon Jul 11 11:11:23 2016 +0800 添加了停止下载的抽象基类接口；增加了视频下载业务模块。 commit 105c74a Merge: 399ae5c 2c94e0b Author: mk-z <[email protected]> Date: Mon Jul 11 09:23:02 2016 +0800 Merge branch 'transation' of https://github.com/anyboo/uilib into transation commit 399ae5c Author: mk-z <[email protected]> Date: Mon Jul 11 09:20:59 2016 +0800 端口扫描类代码 commit f0e1e8d Author: TongLei <[email protected]> Date: Thu Jul 7 14:48:56 2016 +0800 修改了大华和海康的公共函数接口。 commit 7b20402 Author: TongLei <[email protected]> Date: Wed Jul 6 11:49:14 2016 +0800 1、增加了海康和大华的抽象基类的接口。 2、将海康和大华的SDK的共用头文件分离开来。 3、修改业务中视频文件查询的接口。 commit 4f01163 Merge: 0908ab3 2c94e0b Author: kenny zhang <[email protected]> Date: Wed Jul 6 10:28:20 2016 +0800 Merge pull request #73 from anyboo/transation Transation commit 2c94e0b Author: kenny zhang <[email protected]> Date: Wed Jul 6 10:27:20 2016 +0800 Update ipset.txt 添加头文件 commit 7e929c1 Author: mk-z <[email protected]> Date: Wed Jul 6 10:24:18 2016 +0800 添加ip设置说明 commit 69a9fb8 Author: TongLei <[email protected]> Date: Wed Jul 6 10:11:20 2016 +0800 大华添加了查询设备的功能 commit a199aea Author: mk-z <[email protected]> Date: Tue Jul 5 18:38:15 2016 +0800 移植完成原ip设置 commit d716728 Author: mk-z <[email protected]> Date: Mon Jul 4 20:08:35 2016 +0800 添加获取默认设备 commit 28d257e Author: TongLei <[email protected]> Date: Mon Jul 4 19:50:03 2016 +0800 1、完成了业务模块视频查询的测试。 2、增加了SDK的公共头文件以及对一些接口进行修改。 commit 8ca05a3 Author: TongLei <[email protected]> Date: Mon Jul 4 14:56:32 2016 +0800 1、修复海康SDK的下载功能的问题 2、完成了将海康SDK中将文件信息写入到JSON文件的功能 3、完成了将海康SDK中将文件信息写入到数据库中的功能 commit 6a987f6 Author: mk-z <[email protected]> Date: Sat Jul 2 17:50:49 2016 +0800 ip设置 commit 0474b04 Author: TongLei <[email protected]> Date: Sat Jul 2 17:37:48 2016 +0800 完成了一部分海康SDK的封装。 commit 5e2b532 Author: TongLei <[email protected]> Date: Sat Jul 2 10:49:36 2016 +0800 在大华SDK中添加写入数据库分功能 commit b071aed Author: TongLei <[email protected]> Date: Fri Jul 1 22:23:42 2016 +0800 完成了海康的初始化、登录。 commit 8ffa46b Author: TongLei <[email protected]> Date: Fri Jul 1 16:47:30 2016 +0800 定义了海康SDK的接口 commit 0908ab3 Merge: 6a8d135 ad2b1f7 Author: kenny zhang <[email protected]> Date: Fri Jul 1 13:33:41 2016 +0800 Merge pull request #71 from anyboo/Tong_Lei Tong lei commit ad2b1f7 Author: TongLei <[email protected]> Date: Fri Jul 1 13:27:25 2016 +0800 修改文件查询的接口 commit edd6c13 Author: TongLei <[email protected]> Date: Fri Jul 1 11:44:37 2016 +0800 修改了大华的SDK的数据接口，以及完成部分文件查询的工作。 commit 75a3b78 Author: TongLei <[email protected]> Date: Fri Jul 1 11:07:16 2016 +0800 修改了内之间的结构 commit 2526361 Author: TongLei <[email protected]> Date: Fri Jul 1 10:39:38 2016 +0800 添加文件查询的业务模块 commit d94b7f0 Author: TongLei <[email protected]> Date: Fri Jul 1 10:32:13 2016 +0800 重新配置环境 commit 6a8d135 Merge: 8e527e6 0dbc915 Author: Kevin Yu <[email protected]> Date: Thu Jun 30 16:44:37 2016 +0800 Merge pull request #68 from anyboo/DownloaderUI Downloader ui commit 8e527e6 Merge: b03f3e7 6cc4d28 Author: Kevin Yu <[email protected]> Date: Thu Jun 30 16:44:21 2016 +0800 Merge pull request #69 from anyboo/DZP_SDK Dzp sdk commit b03f3e7 Merge: d225914 b3ed6ee Author: kenny zhang <[email protected]> Date: Thu Jun 30 16:25:28 2016 +0800 Merge pull request #70 from anyboo/transation 添加头文件包含说明 commit b3ed6ee Author: mk-z <[email protected]> Date: Thu Jun 30 16:23:38 2016 +0800 添加头文件包含说明 commit 0dbc915 Author: wwang13 <[email protected]> Date: Thu Jun 30 15:49:34 2016 +0800 Modify the full screen issues commit d225914 Merge: ff4c5ce 2ba12ca Author: kenny zhang <[email protected]> Date: Thu Jun 30 15:44:02 2016 +0800 Merge pull request #67 from anyboo/transation Transation commit 2ba12ca Author: mk-z <[email protected]> Date: Thu Jun 30 15:38:21 2016 +0800 完善厂商查询，将debug模式写到memory.db commit 59bb09d Author: mk-z <[email protected]> Date: Thu Jun 30 09:19:20 2016 +0800 删除多余的代码 commit 1c1d76c Author: wwang13 <[email protected]> Date: Wed Jun 29 19:29:26 2016 +0800 2016/06/29 commit ff4c5ce Merge: 2afe479 92a3835 Author: kenny zhang <[email protected]> Date: Wed Jun 29 19:06:52 2016 +0800 Merge pull request #66 from anyboo/transation 修改读和写数据函数的参数 commit 92a3835 Author: mk-z <[email protected]> Date: Wed Jun 29 19:05:10 2016 +0800 修改读和写数据函数的参数 commit c4e2e6a Author: wwang13 <[email protected]> Date: Tue Jun 28 17:06:40 2016 +0800 add Vendor and channel List show code and add other tools window commit d1725c0 Author: wwang13 <[email protected]> Date: Mon Jun 27 19:44:53 2016 +0800 2016/06/27 # Conflicts: # TRobot/Robot/AbstractVendor.h # TRobot/Robot/CommonUtrl.cpp # TRobot/Robot/DHVendor/DHVendor.cpp # TRobot/Robot/DHVendor/DHVendor.h # TRobot/Robot/DZPVendor/DZPVendor.cpp # TRobot/Robot/DZPVendor/DZPVendor.h # TRobot/Robot/Device.cpp # TRobot/Robot/Device.h # TRobot/Robot/DeviceManager.cpp # TRobot/Robot/DeviceManager.h # TRobot/Robot/HKVendor/HKVendor.cpp # TRobot/Robot/HKVendor/HKVendor.h # TRobot/Robot/JxjVendor/JxjVendor.cpp # TRobot/Robot/JxjVendor/JxjVendor.h # TRobot/Robot/Log/JAVDec.txt # TRobot/Robot/Log/JNetSDK.txt # TRobot/Robot/LoginDevice.cpp # TRobot/Robot/LoginDevice.h # TRobot/Robot/Network/PING.cpp # TRobot/Robot/Network/PING.h # TRobot/Robot/Robot.cpp # TRobot/Robot/Robot.vcxproj # TRobot/Robot/Robot.vcxproj.filters # TRobot/Robot/SearchDevice.cpp # TRobot/Robot/SearchFileList.config # TRobot/Robot/memory.db # TRobot/Robot/phoenix.db # TRobot/Robot/x86/IvsDrawer.dll # TRobot/Robot/x86/aacdec.dll # TRobot/Robot/x86/amrdec.dll # TRobot/Robot/x86/dhconfigsdk.dll # TRobot/Robot/x86/dhnetsdk.h # TRobot/Robot/x86/dhplay.dll # TRobot/Robot/x86/h264dec.dll # TRobot/Robot/x86/mjpegdec.dll # TRobot/Robot/x86/mp3dec.dll # TRobot/Robot/x86/mpeg4dec.dll # TRobot/Robot/x86/mpeg4enc.dll # TRobot/Robot/x86/postproc.dll # x86/DH/dhnetsdk.dll # x86/Robot_d.exe
commit 2c05e18 Author: zhoujiechj <[email protected]> Date: Mon Jul 18 18:31:09 2016 +0800 更改清楚文件列表的接口 commit 2f00040 Author: zhoujiechj <[email protected]> Date: Mon Jul 18 18:11:57 2016 +0800 Squashed commit of the following: commit 8eb1253 Author: TongLei <[email protected]> Date: Mon Jul 18 17:51:32 2016 +0800 Squashed commit of the following: commit 769067e Author: zhoujiechj <[email protected]> Date: Thu Jul 14 18:19:04 2016 +0800 完善 “设备发现”、“设备登陆” 业务流程，新增 “设备管理” 业务： 1、“设备发现” 将之前的阻塞型改为非阻塞型，即使用Poco库的线程池，管理“设备发现”业务类； 2、“设备登陆” 业务增加“登陆设备时写设备信息到数据库，登出设备则从数据库删除设备设备信息”，用于“当主程序退出时，重新开启程序可以自动重新登陆之前已登陆的设备的情况”； 3、新增 “设备管理” 业务，即完成第2条中说的“自动重新登陆”的功能，包括“程序重新登陆上次退出程序时已登陆设备”和“重新登陆断开连接的设备”的功能 commit 7b484ef Author: zhoujiechj <[email protected]> Date: Tue Jul 12 21:26:27 2016 +0800 新增 “设备搜索” 线程轮询部分 commit 51be435 Author: zhoujiechj <[email protected]> Date: Mon Jul 11 20:10:46 2016 +0800 测试下载文件回调函数的 “消息通知” 功能 commit 2d7c5a8 Author: zhoujiechj <[email protected]> Date: Fri Jul 8 11:12:17 2016 +0800 修改jxj SDK 类名CJxjVendor 为 CJXJVendor commit 0d37b76 Author: zhoujiechj <[email protected]> Date: Fri Jul 8 10:45:16 2016 +0800 设备发现、设备登陆、文件搜索 合并 commit c619632 Author: zhoujiechj <[email protected]> Date: Thu Jul 7 20:59:32 2016 +0800 完善 “文件播放” 测试部分 commit 33e5129 Author: zhoujiechj <[email protected]> Date: Thu Jul 7 17:56:22 2016 +0800 测试 “文件搜索” 业务流程： 1、整合童磊的文件搜索类SearchVideo，梳理流程 “设备发现-设备登陆-文件搜索”； commit d0b1a26 Author: zhoujiechj <[email protected]> Date: Thu Jul 7 16:11:17 2016 +0800 完善 “设备发现和设备登陆” 业务流程： 1、增加“有设备发现功能”和“没有设备发现功能”的流程，实现获取到目前已做的4个SDK的设备数量及相关信息的功能，其中佳信捷、迪智普、大华等SDK有设备发现功能，海康SDK没有设备发现功能； 2、合并之前的“设备管理类DeviceManager”到“设备登陆类LoginDevice”中，统一管理登陆成功的设备（有别于设备发现阶段的试探性登陆）； commit b6aefcb Author: zhoujiechj <[email protected]> Date: Wed Jul 6 20:12:50 2016 +0800 完善 “设备发现中的循环登陆扫描设备” 部分： 1、使用责任链的设计模式，在Device类中增加相应责任链机制，完成“循环登陆扫描设备”的功能，连续sdk登陆有登陆时的错误，该问题在验证； commit 4b4c160 Author: zhoujiechj <[email protected]> Date: Wed Jul 6 17:19:13 2016 +0800 合并 大华、海康SDK（漏掉一些新增文件）： 1、将各Vendor头文件中有关的各自底层sdk相关的变量、函数移植到相应的cpp文件，解决之前不同sdk厂商使用相似头文件造成重定义的问题； 2、取消使用各自sdk厂商生成静态库lib的方法，回复到之前类的方式调用各自sdk的方法 commit ce5d47d Author: zhoujiechj <[email protected]> Date: Wed Jul 6 17:10:27 2016 +0800 合并 大华、海康SDK： 1、将各Vendor头文件中有关的各自底层sdk相关的变量、函数移植到相应的cpp文件，解决之前不同sdk厂商使用相似头文件造成重定义的问题； 2、取消使用各自sdk厂商生成静态库lib的方法，回复到之前类的方式调用各自sdk的方法 commit 31e2973 Author: zhoujiechj <[email protected]> Date: Tue Jul 5 20:29:02 2016 +0800 新增部分 “轮循登陆查找设备” 的功能 commit 4c227b9 Author: zhoujiechj <[email protected]> Date: Tue Jul 5 17:00:46 2016 +0800 梳理 “设备发现”、“设备登陆” 业务流程 commit e49ec98 Author: zhoujiechj <[email protected]> Date: Mon Jul 4 19:56:23 2016 +0800 1、将佳信捷SDK和迪智普SDK生产静态库JXJVendor.lib和DZPVendor.lib，解决sdk头文件中结构体或者函数重定义的问题； 2、完善各SDK头文件引用； commit 2dbc034 Author: zhoujiechj <[email protected]> Date: Sat Jul 2 16:02:49 2016 +0800 新增“设备发现”、“设备登陆”、“设备搜索”的业务流程： 1、设备发现只处理佳信捷和迪智普SDK; 2、设备登陆、设备搜索测试了佳信捷SDK; commit 832b6fa Author: zhoujiechj <[email protected]> Date: Sat Jul 2 10:39:27 2016 +0800 新增 佳信捷和迪智普SDK合并文件清单.txt commit 338e716 Author: zhoujiechj <[email protected]> Date: Fri Jul 1 22:24:30 2016 +0800 新增已有设备搜索流程 commit fc73567 Author: zhoujiechj <[email protected]> Date: Thu Jun 30 21:17:02 2016 +0800 新增迪智浦SDK 搜索、下载 接口 # Conflicts: # TRobot/Robot/AbstractVendor.h # TRobot/Robot/CommonUtrl.cpp # TRobot/Robot/CommonUtrl.h # TRobot/Robot/DHVendor.h # TRobot/Robot/DHVendor/DHVendor.cpp # TRobot/Robot/DHsdk/IvsDrawer.dll # TRobot/Robot/DHsdk/aacdec.dll # TRobot/Robot/DHsdk/amrdec.dll # TRobot/Robot/DHsdk/dhconfigsdk.dll # TRobot/Robot/DHsdk/dhnetsdk.dll # TRobot/Robot/DHsdk/dhplay.dll # TRobot/Robot/DHsdk/h264dec.dll # TRobot/Robot/DHsdk/mjpegdec.dll # TRobot/Robot/DHsdk/mp3dec.dll # TRobot/Robot/DHsdk/mpeg4dec.dll # TRobot/Robot/DZPVendor/DZPVendor.cpp # TRobot/Robot/DZPVendor/DZPVendor.h # TRobot/Robot/Device.cpp # TRobot/Robot/Device.h # TRobot/Robot/JxjVendor/JxjVendor.cpp # TRobot/Robot/JxjVendor/JxjVendor.h # TRobot/Robot/Robot.cpp # TRobot/Robot/Robot.vcxproj # TRobot/Robot/Robot.vcxproj.filters # TRobot/Robot/SearchFileList.config # TRobot/Robot/x86/dhnetsdk.h commit 63bcd30 Author: TongLei <[email protected]> Date: Mon Jul 18 16:06:49 2016 +0800 1、删除测试文件。 commit 4746505 Author: TongLei <[email protected]> Date: Mon Jul 18 16:03:44 2016 +0800 1、优化了SDK中的代码。 commit b14143f Author: TongLei <[email protected]> Date: Mon Jul 18 09:43:15 2016 +0800 1、删除了HK处理文件名相同的函数。 commit afaf768 Author: TongLei <[email protected]> Date: Fri Jul 15 19:29:52 2016 +0800 1、在海康里面增加了文件重复过滤的功能。 2、将视频查询中上报给UI次数的位置由SDK中修改到业务中。 commit 0e963d6 Author: TongLei <[email protected]> Date: Fri Jul 15 18:52:30 2016 +0800 1、对海康的文件路径进行修改。 2、修复了文件查询业务中取消文件失败的BUG commit 444fcbf Author: TongLei <[email protected]> Date: Fri Jul 15 13:51:35 2016 +0800 1、更新大华SDK的DLL commit 10d2849 Merge: eb3b261 de003d9 Author: TongLei <[email protected]> Date: Fri Jul 15 10:13:34 2016 +0800 Merge remote-tracking branch 'remotes/origin/master' into Tong_Lei commit eb3b261 Author: TongLei <[email protected]> Date: Fri Jul 15 10:01:40 2016 +0800 1、把不需要的文件删除。 commit de003d9 Merge: 1ef7c38 cbc558e Author: kenny zhang <[email protected]> Date: Fri Jul 15 09:55:48 2016 +0800 Merge pull request #78 from anyboo/transation Transation commit cbc558e Author: mk-z <[email protected]> Date: Fri Jul 15 09:54:25 2016 +0800 修改数据库使用说明 commit b9a71bd Author: mk-z <[email protected]> Date: Fri Jul 15 09:47:28 2016 +0800 加入数据库异常处理 commit 21b65da Author: TongLei <[email protected]> Date: Thu Jul 14 19:08:02 2016 +0800 1、修改了大华SDK中文件路径的问题。 2、修改了视频文件查询的结构。 commit 1ef7c38 Merge: 5637a4f 6e6619a Author: kenny zhang <[email protected]> Date: Thu Jul 14 18:04:57 2016 +0800 Merge pull request #77 from anyboo/transation 端口扫描类和调用说明 commit 6e6619a Author: mk-z <[email protected]> Date: Thu Jul 14 18:02:46 2016 +0800 端口扫描类和调用说明 commit 5637a4f Merge: 77455a2 3b09634 Author: kenny zhang <[email protected]> Date: Thu Jul 14 11:46:45 2016 +0800 Merge pull request #76 from anyboo/transation 添加文件数据库，修改数据库说明，内存数据库单例模式修改 commit 3b09634 Author: mk-z <[email protected]> Date: Thu Jul 14 10:58:40 2016 +0800 添加文件数据库，修改数据库说明，内存数据库单例模式修改 commit 6212e85 Author: TongLei <[email protected]> Date: Thu Jul 14 09:06:39 2016 +0800 完成视频文件查询的基本流程。 commit 77455a2 Merge: a932ee3 5aa5749 Author: kenny zhang <[email protected]> Date: Wed Jul 13 14:31:25 2016 +0800 Merge pull request #75 from anyboo/transation 修改插入数据库慢的问题 commit 5aa5749 Author: mk-z <[email protected]> Date: Wed Jul 13 14:27:49 2016 +0800 修改插入数据库慢的问题 commit 5a93d06 Author: TongLei <[email protected]> Date: Tue Jul 12 21:25:42 2016 +0800 完成了单文件下载的功能。 commit a932ee3 Merge: 4f01163 7da0118 Author: kenny zhang <[email protected]> Date: Tue Jul 12 17:47:17 2016 +0800 Merge pull request #74 from anyboo/transation Transation commit 7da0118 Author: mk-z <[email protected]> Date: Tue Jul 12 17:45:23 2016 +0800 修改命名空间的问题 commit 68fd5c3 Author: mk-z <[email protected]> Date: Tue Jul 12 17:16:22 2016 +0800 完成端口扫描模块代码 commit 475bdac Author: TongLei <[email protected]> Date: Tue Jul 12 14:53:18 2016 +0800 添加了视频下载模块的输出接口 commit 5be8a40 Author: TongLei <[email protected]> Date: Mon Jul 11 20:13:24 2016 +0800 1、实现了将SDK中得到的文件大小以及总文件大小发送到视频下载的业务层。 2、完善文件下载的部分功能。 commit 55a8039 Author: mk-z <[email protected]> Date: Mon Jul 11 20:07:32 2016 +0800 端口扫描完整代码，但有错误未修改 commit c6999b0 Author: TongLei <[email protected]> Date: Mon Jul 11 11:11:23 2016 +0800 添加了停止下载的抽象基类接口；增加了视频下载业务模块。 commit 105c74a Merge: 399ae5c 2c94e0b Author: mk-z <[email protected]> Date: Mon Jul 11 09:23:02 2016 +0800 Merge branch 'transation' of https://github.com/anyboo/uilib into transation commit 399ae5c Author: mk-z <[email protected]> Date: Mon Jul 11 09:20:59 2016 +0800 端口扫描类代码 commit f0e1e8d Author: TongLei <[email protected]> Date: Thu Jul 7 14:48:56 2016 +0800 修改了大华和海康的公共函数接口。 commit 7b20402 Author: TongLei <[email protected]> Date: Wed Jul 6 11:49:14 2016 +0800 1、增加了海康和大华的抽象基类的接口。 2、将海康和大华的SDK的共用头文件分离开来。 3、修改业务中视频文件查询的接口。 commit 4f01163 Merge: 0908ab3 2c94e0b Author: kenny zhang <[email protected]> Date: Wed Jul 6 10:28:20 2016 +0800 Merge pull request #73 from anyboo/transation Transation commit 2c94e0b Author: kenny zhang <[email protected]> Date: Wed Jul 6 10:27:20 2016 +0800 Update ipset.txt 添加头文件 commit 7e929c1 Author: mk-z <[email protected]> Date: Wed Jul 6 10:24:18 2016 +0800 添加ip设置说明 commit 69a9fb8 Author: TongLei <[email protected]> Date: Wed Jul 6 10:11:20 2016 +0800 大华添加了查询设备的功能 commit a199aea Author: mk-z <[email protected]> Date: Tue Jul 5 18:38:15 2016 +0800 移植完成原ip设置 commit d716728 Author: mk-z <[email protected]> Date: Mon Jul 4 20:08:35 2016 +0800 添加获取默认设备 commit 28d257e Author: TongLei <[email protected]> Date: Mon Jul 4 19:50:03 2016 +0800 1、完成了业务模块视频查询的测试。 2、增加了SDK的公共头文件以及对一些接口进行修改。 commit 8ca05a3 Author: TongLei <[email protected]> Date: Mon Jul 4 14:56:32 2016 +0800 1、修复海康SDK的下载功能的问题 2、完成了将海康SDK中将文件信息写入到JSON文件的功能 3、完成了将海康SDK中将文件信息写入到数据库中的功能 commit 6a987f6 Author: mk-z <[email protected]> Date: Sat Jul 2 17:50:49 2016 +0800 ip设置 commit 0474b04 Author: TongLei <[email protected]> Date: Sat Jul 2 17:37:48 2016 +0800 完成了一部分海康SDK的封装。 commit 5e2b532 Author: TongLei <[email protected]> Date: Sat Jul 2 10:49:36 2016 +0800 在大华SDK中添加写入数据库分功能 commit b071aed Author: TongLei <[email protected]> Date: Fri Jul 1 22:23:42 2016 +0800 完成了海康的初始化、登录。 commit 8ffa46b Author: TongLei <[email protected]> Date: Fri Jul 1 16:47:30 2016 +0800 定义了海康SDK的接口 commit 0908ab3 Merge: 6a8d135 ad2b1f7 Author: kenny zhang <[email protected]> Date: Fri Jul 1 13:33:41 2016 +0800 Merge pull request #71 from anyboo/Tong_Lei Tong lei commit ad2b1f7 Author: TongLei <[email protected]> Date: Fri Jul 1 13:27:25 2016 +0800 修改文件查询的接口 commit edd6c13 Author: TongLei <[email protected]> Date: Fri Jul 1 11:44:37 2016 +0800 修改了大华的SDK的数据接口，以及完成部分文件查询的工作。 commit 75a3b78 Author: TongLei <[email protected]> Date: Fri Jul 1 11:07:16 2016 +0800 修改了内之间的结构 commit 2526361 Author: TongLei <[email protected]> Date: Fri Jul 1 10:39:38 2016 +0800 添加文件查询的业务模块 commit d94b7f0 Author: TongLei <[email protected]> Date: Fri Jul 1 10:32:13 2016 +0800 重新配置环境 commit 6a8d135 Merge: 8e527e6 0dbc915 Author: Kevin Yu <[email protected]> Date: Thu Jun 30 16:44:37 2016 +0800 Merge pull request #68 from anyboo/DownloaderUI Downloader ui commit 8e527e6 Merge: b03f3e7 6cc4d28 Author: Kevin Yu <[email protected]> Date: Thu Jun 30 16:44:21 2016 +0800 Merge pull request #69 from anyboo/DZP_SDK Dzp sdk commit b03f3e7 Merge: d225914 b3ed6ee Author: kenny zhang <[email protected]> Date: Thu Jun 30 16:25:28 2016 +0800 Merge pull request #70 from anyboo/transation 添加头文件包含说明 commit b3ed6ee Author: mk-z <[email protected]> Date: Thu Jun 30 16:23:38 2016 +0800 添加头文件包含说明 commit 0dbc915 Author: wwang13 <[email protected]> Date: Thu Jun 30 15:49:34 2016 +0800 Modify the full screen issues commit d225914 Merge: ff4c5ce 2ba12ca Author: kenny zhang <[email protected]> Date: Thu Jun 30 15:44:02 2016 +0800 Merge pull request #67 from anyboo/transation Transation commit 2ba12ca Author: mk-z <[email protected]> Date: Thu Jun 30 15:38:21 2016 +0800 完善厂商查询，将debug模式写到memory.db commit 59bb09d Author: mk-z <[email protected]> Date: Thu Jun 30 09:19:20 2016 +0800 删除多余的代码 commit 1c1d76c Author: wwang13 <[email protected]> Date: Wed Jun 29 19:29:26 2016 +0800 2016/06/29 commit ff4c5ce Merge: 2afe479 92a3835 Author: kenny zhang <[email protected]> Date: Wed Jun 29 19:06:52 2016 +0800 Merge pull request #66 from anyboo/transation 修改读和写数据函数的参数 commit 92a3835 Author: mk-z <[email protected]> Date: Wed Jun 29 19:05:10 2016 +0800 修改读和写数据函数的参数 commit c4e2e6a Author: wwang13 <[email protected]> Date: Tue Jun 28 17:06:40 2016 +0800 add Vendor and channel List show code and add other tools window commit d1725c0 Author: wwang13 <[email protected]> Date: Mon Jun 27 19:44:53 2016 +0800 2016/06/27 # Conflicts: # TRobot/Robot/AbstractVendor.h # TRobot/Robot/CommonUtrl.cpp # TRobot/Robot/DHVendor/DHVendor.cpp # TRobot/Robot/DHVendor/DHVendor.h # TRobot/Robot/DZPVendor/DZPVendor.cpp # TRobot/Robot/DZPVendor/DZPVendor.h # TRobot/Robot/Device.cpp # TRobot/Robot/Device.h # TRobot/Robot/DeviceManager.cpp # TRobot/Robot/DeviceManager.h # TRobot/Robot/HKVendor/HKVendor.cpp # TRobot/Robot/HKVendor/HKVendor.h # TRobot/Robot/JxjVendor/JxjVendor.cpp # TRobot/Robot/JxjVendor/JxjVendor.h # TRobot/Robot/Log/JAVDec.txt # TRobot/Robot/Log/JNetSDK.txt # TRobot/Robot/LoginDevice.cpp # TRobot/Robot/LoginDevice.h # TRobot/Robot/Network/PING.cpp # TRobot/Robot/Network/PING.h # TRobot/Robot/Robot.cpp # TRobot/Robot/Robot.vcxproj # TRobot/Robot/Robot.vcxproj.filters # TRobot/Robot/SearchDevice.cpp # TRobot/Robot/SearchFileList.config # TRobot/Robot/memory.db # TRobot/Robot/phoenix.db # TRobot/Robot/x86/IvsDrawer.dll # TRobot/Robot/x86/aacdec.dll # TRobot/Robot/x86/amrdec.dll # TRobot/Robot/x86/dhconfigsdk.dll # TRobot/Robot/x86/dhnetsdk.h # TRobot/Robot/x86/dhplay.dll # TRobot/Robot/x86/h264dec.dll # TRobot/Robot/x86/mjpegdec.dll # TRobot/Robot/x86/mp3dec.dll # TRobot/Robot/x86/mpeg4dec.dll # TRobot/Robot/x86/mpeg4enc.dll # TRobot/Robot/x86/postproc.dll # x86/DH/dhnetsdk.dll # x86/Robot_d.exe commit bd3d71d Author: zhoujiechj <[email protected]> Date: Mon Jul 18 17:57:49 2016 +0800 更改portscan等文件的目录位置 commit 76c2edc Author: zhoujiechj <[email protected]> Date: Mon Jul 18 16:07:35 2016 +0800 删除EXE文件 commit 393b940 Author: zhoujiechj <[email protected]> Date: Mon Jul 18 16:02:09 2016 +0800 与童磊合并sdk commit 99c567f Author: zhoujiechj <[email protected]> Date: Fri Jul 15 19:47:14 2016 +0800 整合端口扫描业务流程 commit 769067e Author: zhoujiechj <[email protected]> Date: Thu Jul 14 18:19:04 2016 +0800 完善 “设备发现”、“设备登陆” 业务流程，新增 “设备管理” 业务： 1、“设备发现” 将之前的阻塞型改为非阻塞型，即使用Poco库的线程池，管理“设备发现”业务类； 2、“设备登陆” 业务增加“登陆设备时写设备信息到数据库，登出设备则从数据库删除设备设备信息”，用于“当主程序退出时，重新开启程序可以自动重新登陆之前已登陆的设备的情况”； 3、新增 “设备管理” 业务，即完成第2条中说的“自动重新登陆”的功能，包括“程序重新登陆上次退出程序时已登陆设备”和“重新登陆断开连接的设备”的功能 commit 7b484ef Author: zhoujiechj <[email protected]> Date: Tue Jul 12 21:26:27 2016 +0800 新增 “设备搜索” 线程轮询部分 commit 51be435 Author: zhoujiechj <[email protected]> Date: Mon Jul 11 20:10:46 2016 +0800 测试下载文件回调函数的 “消息通知” 功能 commit 2d7c5a8 Author: zhoujiechj <[email protected]> Date: Fri Jul 8 11:12:17 2016 +0800 修改jxj SDK 类名CJxjVendor 为 CJXJVendor commit 0d37b76 Author: zhoujiechj <[email protected]> Date: Fri Jul 8 10:45:16 2016 +0800 设备发现、设备登陆、文件搜索 合并 commit c619632 Author: zhoujiechj <[email protected]> Date: Thu Jul 7 20:59:32 2016 +0800 完善 “文件播放” 测试部分 commit 33e5129 Author: zhoujiechj <[email protected]> Date: Thu Jul 7 17:56:22 2016 +0800 测试 “文件搜索” 业务流程： 1、整合童磊的文件搜索类SearchVideo，梳理流程 “设备发现-设备登陆-文件搜索”； commit d0b1a26 Author: zhoujiechj <[email protected]> Date: Thu Jul 7 16:11:17 2016 +0800 完善 “设备发现和设备登陆” 业务流程： 1、增加“有设备发现功能”和“没有设备发现功能”的流程，实现获取到目前已做的4个SDK的设备数量及相关信息的功能，其中佳信捷、迪智普、大华等SDK有设备发现功能，海康SDK没有设备发现功能； 2、合并之前的“设备管理类DeviceManager”到“设备登陆类LoginDevice”中，统一管理登陆成功的设备（有别于设备发现阶段的试探性登陆）； commit b6aefcb Author: zhoujiechj <[email protected]> Date: Wed Jul 6 20:12:50 2016 +0800 完善 “设备发现中的循环登陆扫描设备” 部分： 1、使用责任链的设计模式，在Device类中增加相应责任链机制，完成“循环登陆扫描设备”的功能，连续sdk登陆有登陆时的错误，该问题在验证； commit 4b4c160 Author: zhoujiechj <[email protected]> Date: Wed Jul 6 17:19:13 2016 +0800 合并 大华、海康SDK（漏掉一些新增文件）： 1、将各Vendor头文件中有关的各自底层sdk相关的变量、函数移植到相应的cpp文件，解决之前不同sdk厂商使用相似头文件造成重定义的问题； 2、取消使用各自sdk厂商生成静态库lib的方法，回复到之前类的方式调用各自sdk的方法 commit ce5d47d Author: zhoujiechj <[email protected]> Date: Wed Jul 6 17:10:27 2016 +0800 合并 大华、海康SDK： 1、将各Vendor头文件中有关的各自底层sdk相关的变量、函数移植到相应的cpp文件，解决之前不同sdk厂商使用相似头文件造成重定义的问题； 2、取消使用各自sdk厂商生成静态库lib的方法，回复到之前类的方式调用各自sdk的方法 commit 31e2973 Author: zhoujiechj <[email protected]> Date: Tue Jul 5 20:29:02 2016 +0800 新增部分 “轮循登陆查找设备” 的功能 commit 4c227b9 Author: zhoujiechj <[email protected]> Date: Tue Jul 5 17:00:46 2016 +0800 梳理 “设备发现”、“设备登陆” 业务流程 commit e49ec98 Author: zhoujiechj <[email protected]> Date: Mon Jul 4 19:56:23 2016 +0800 1、将佳信捷SDK和迪智普SDK生产静态库JXJVendor.lib和DZPVendor.lib，解决sdk头文件中结构体或者函数重定义的问题； 2、完善各SDK头文件引用； commit 2dbc034 Author: zhoujiechj <[email protected]> Date: Sat Jul 2 16:02:49 2016 +0800 新增“设备发现”、“设备登陆”、“设备搜索”的业务流程： 1、设备发现只处理佳信捷和迪智普SDK; 2、设备登陆、设备搜索测试了佳信捷SDK; commit 832b6fa Author: zhoujiechj <[email protected]> Date: Sat Jul 2 10:39:27 2016 +0800 新增 佳信捷和迪智普SDK合并文件清单.txt commit 338e716 Author: zhoujiechj <[email protected]> Date: Fri Jul 1 22:24:30 2016 +0800 新增已有设备搜索流程 commit fc73567 Author: zhoujiechj <[email protected]> Date: Thu Jun 30 21:17:02 2016 +0800 新增迪智浦SDK 搜索、下载 接口 # Conflicts: # TRobot/Robot/DHVendor/DHVendor.cpp # TRobot/Robot/DHVendor/DHVendor.h # TRobot/Robot/DZPVendor/DZPVendor.cpp # TRobot/Robot/DZPVendor/DZPVendor.h # TRobot/Robot/DeviceManager.cpp # TRobot/Robot/DeviceManager.h # TRobot/Robot/HKVendor/HKVendor.cpp # TRobot/Robot/HKVendor/HKVendor.h # TRobot/Robot/JxjVendor/JxjVendor.cpp # TRobot/Robot/JxjVendor/JxjVendor.h # TRobot/Robot/Log/JAVDec.txt # TRobot/Robot/Log/JNetSDK.txt # TRobot/Robot/LoginDevice.cpp # TRobot/Robot/LoginDevice.h # TRobot/Robot/Network/PING.cpp # TRobot/Robot/Network/PING.h # TRobot/Robot/Robot.cpp # TRobot/Robot/Robot.vcxproj # TRobot/Robot/Robot.vcxproj.filters # TRobot/Robot/SearchDevice.cpp # TRobot/Robot/SearchFileList.config # TRobot/Robot/memory.db # TRobot/Robot/phoenix.db # transation/QMSqlite.h
2、在SDK中增加了端口默认设置。
commit 738c2bc Author: zhoujiechj <[email protected]> Date: Fri Jul 22 11:13:32 2016 +0800 修改 sdk底层创建文件路径等 公共函数 commit b3c8907 Author: zhoujiechj <[email protected]> Date: Thu Jul 21 14:35:07 2016 +0800 同步 sdk接口，更改迪智普的sdk，并测试通过迪智普播放的功能 commit f8af948 Author: zhoujiechj <[email protected]> Date: Thu Jul 21 13:02:38 2016 +0800 更改 sdk接口 download和playvideo commit f616cde Author: zhoujiechj <[email protected]> Date: Wed Jul 20 19:33:27 2016 +0800 更新 “不知道什么” commit 1e75e10 Author: zhoujiechj <[email protected]> Date: Tue Jul 19 19:18:32 2016 +0800 添加 “设备登陆” 异常处理 commit 537a6e7 Author: zhoujiechj <[email protected]> Date: Mon Jul 18 18:58:03 2016 +0800 删除项目文件 commit 384dee7 Author: zhoujiechj <[email protected]> Date: Mon Jul 18 18:41:07 2016 +0800 删除多余头文件 commit 2c05e18 Author: zhoujiechj <[email protected]> Date: Mon Jul 18 18:31:09 2016 +0800 更改清楚文件列表的接口 commit 2f00040 Author: zhoujiechj <[email protected]> Date: Mon Jul 18 18:11:57 2016 +0800 Squashed commit of the following: commit 8eb1253 Author: TongLei <[email protected]> Date: Mon Jul 18 17:51:32 2016 +0800 Squashed commit of the following: commit 769067e Author: zhoujiechj <[email protected]> Date: Thu Jul 14 18:19:04 2016 +0800 完善 “设备发现”、“设备登陆” 业务流程，新增 “设备管理” 业务： 1、“设备发现” 将之前的阻塞型改为非阻塞型，即使用Poco库的线程池，管理“设备发现”业务类； 2、“设备登陆” 业务增加“登陆设备时写设备信息到数据库，登出设备则从数据库删除设备设备信息”，用于“当主程序退出时，重新开启程序可以自动重新登陆之前已登陆的设备的情况”； 3、新增 “设备管理” 业务，即完成第2条中说的“自动重新登陆”的功能，包括“程序重新登陆上次退出程序时已登陆设备”和“重新登陆断开连接的设备”的功能 commit 7b484ef Author: zhoujiechj <[email protected]> Date: Tue Jul 12 21:26:27 2016 +0800 新增 “设备搜索” 线程轮询部分 commit 51be435 Author: zhoujiechj <[email protected]> Date: Mon Jul 11 20:10:46 2016 +0800 测试下载文件回调函数的 “消息通知” 功能 commit 2d7c5a8 Author: zhoujiechj <[email protected]> Date: Fri Jul 8 11:12:17 2016 +0800 修改jxj SDK 类名CJxjVendor 为 CJXJVendor commit 0d37b76 Author: zhoujiechj <[email protected]> Date: Fri Jul 8 10:45:16 2016 +0800 设备发现、设备登陆、文件搜索 合并 commit c619632 Author: zhoujiechj <[email protected]> Date: Thu Jul 7 20:59:32 2016 +0800 完善 “文件播放” 测试部分 commit 33e5129 Author: zhoujiechj <[email protected]> Date: Thu Jul 7 17:56:22 2016 +0800 测试 “文件搜索” 业务流程： 1、整合童磊的文件搜索类SearchVideo，梳理流程 “设备发现-设备登陆-文件搜索”； commit d0b1a26 Author: zhoujiechj <[email protected]> Date: Thu Jul 7 16:11:17 2016 +0800 完善 “设备发现和设备登陆” 业务流程： 1、增加“有设备发现功能”和“没有设备发现功能”的流程，实现获取到目前已做的4个SDK的设备数量及相关信息的功能，其中佳信捷、迪智普、大华等SDK有设备发现功能，海康SDK没有设备发现功能； 2、合并之前的“设备管理类DeviceManager”到“设备登陆类LoginDevice”中，统一管理登陆成功的设备（有别于设备发现阶段的试探性登陆）； commit b6aefcb Author: zhoujiechj <[email protected]> Date: Wed Jul 6 20:12:50 2016 +0800 完善 “设备发现中的循环登陆扫描设备” 部分： 1、使用责任链的设计模式，在Device类中增加相应责任链机制，完成“循环登陆扫描设备”的功能，连续sdk登陆有登陆时的错误，该问题在验证； commit 4b4c160 Author: zhoujiechj <[email protected]> Date: Wed Jul 6 17:19:13 2016 +0800 合并 大华、海康SDK（漏掉一些新增文件）： 1、将各Vendor头文件中有关的各自底层sdk相关的变量、函数移植到相应的cpp文件，解决之前不同sdk厂商使用相似头文件造成重定义的问题； 2、取消使用各自sdk厂商生成静态库lib的方法，回复到之前类的方式调用各自sdk的方法 commit ce5d47d Author: zhoujiechj <[email protected]> Date: Wed Jul 6 17:10:27 2016 +0800 合并 大华、海康SDK： 1、将各Vendor头文件中有关的各自底层sdk相关的变量、函数移植到相应的cpp文件，解决之前不同sdk厂商使用相似头文件造成重定义的问题； 2、取消使用各自sdk厂商生成静态库lib的方法，回复到之前类的方式调用各自sdk的方法 commit 31e2973 Author: zhoujiechj <[email protected]> Date: Tue Jul 5 20:29:02 2016 +0800 新增部分 “轮循登陆查找设备” 的功能 commit 4c227b9 Author: zhoujiechj <[email protected]> Date: Tue Jul 5 17:00:46 2016 +0800 梳理 “设备发现”、“设备登陆” 业务流程 commit e49ec98 Author: zhoujiechj <[email protected]> Date: Mon Jul 4 19:56:23 2016 +0800 1、将佳信捷SDK和迪智普SDK生产静态库JXJVendor.lib和DZPVendor.lib，解决sdk头文件中结构体或者函数重定义的问题； 2、完善各SDK头文件引用； commit 2dbc034 Author: zhoujiechj <[email protected]> Date: Sat Jul 2 16:02:49 2016 +0800 新增“设备发现”、“设备登陆”、“设备搜索”的业务流程： 1、设备发现只处理佳信捷和迪智普SDK; 2、设备登陆、设备搜索测试了佳信捷SDK; commit 832b6fa Author: zhoujiechj <[email protected]> Date: Sat Jul 2 10:39:27 2016 +0800 新增 佳信捷和迪智普SDK合并文件清单.txt commit 338e716 Author: zhoujiechj <[email protected]> Date: Fri Jul 1 22:24:30 2016 +0800 新增已有设备搜索流程 commit fc73567 Author: zhoujiechj <[email protected]> Date: Thu Jun 30 21:17:02 2016 +0800 新增迪智浦SDK 搜索、下载 接口 # Conflicts: # TRobot/Robot/AbstractVendor.h # TRobot/Robot/CommonUtrl.cpp # TRobot/Robot/CommonUtrl.h # TRobot/Robot/DHVendor.h # TRobot/Robot/DHVendor/DHVendor.cpp # TRobot/Robot/DHsdk/IvsDrawer.dll # TRobot/Robot/DHsdk/aacdec.dll # TRobot/Robot/DHsdk/amrdec.dll # TRobot/Robot/DHsdk/dhconfigsdk.dll # TRobot/Robot/DHsdk/dhnetsdk.dll # TRobot/Robot/DHsdk/dhplay.dll # TRobot/Robot/DHsdk/h264dec.dll # TRobot/Robot/DHsdk/mjpegdec.dll # TRobot/Robot/DHsdk/mp3dec.dll # TRobot/Robot/DHsdk/mpeg4dec.dll # TRobot/Robot/DZPVendor/DZPVendor.cpp # TRobot/Robot/DZPVendor/DZPVendor.h # TRobot/Robot/Device.cpp # TRobot/Robot/Device.h # TRobot/Robot/JxjVendor/JxjVendor.cpp # TRobot/Robot/JxjVendor/JxjVendor.h # TRobot/Robot/Robot.cpp # TRobot/Robot/Robot.vcxproj # TRobot/Robot/Robot.vcxproj.filters # TRobot/Robot/SearchFileList.config # TRobot/Robot/x86/dhnetsdk.h commit 63bcd30 Author: TongLei <[email protected]> Date: Mon Jul 18 16:06:49 2016 +0800 1、删除测试文件。 commit 4746505 Author: TongLei <[email protected]> Date: Mon Jul 18 16:03:44 2016 +0800 1、优化了SDK中的代码。 commit b14143f Author: TongLei <[email protected]> Date: Mon Jul 18 09:43:15 2016 +0800 1、删除了HK处理文件名相同的函数。 commit afaf768 Author: TongLei <[email protected]> Date: Fri Jul 15 19:29:52 2016 +0800 1、在海康里面增加了文件重复过滤的功能。 2、将视频查询中上报给UI次数的位置由SDK中修改到业务中。 commit 0e963d6 Author: TongLei <[email protected]> Date: Fri Jul 15 18:52:30 2016 +0800 1、对海康的文件路径进行修改。 2、修复了文件查询业务中取消文件失败的BUG commit 444fcbf Author: TongLei <[email protected]> Date: Fri Jul 15 13:51:35 2016 +0800 1、更新大华SDK的DLL commit 10d2849 Merge: eb3b261 de003d9 Author: TongLei <[email protected]> Date: Fri Jul 15 10:13:34 2016 +0800 Merge remote-tracking branch 'remotes/origin/master' into Tong_Lei commit eb3b261 Author: TongLei <[email protected]> Date: Fri Jul 15 10:01:40 2016 +0800 1、把不需要的文件删除。 commit de003d9 Merge: 1ef7c38 cbc558e Author: kenny zhang <[email protected]> Date: Fri Jul 15 09:55:48 2016 +0800 Merge pull request #78 from anyboo/transation Transation commit cbc558e Author: mk-z <[email protected]> Date: Fri Jul 15 09:54:25 2016 +0800 修改数据库使用说明 commit b9a71bd Author: mk-z <[email protected]> Date: Fri Jul 15 09:47:28 2016 +0800 加入数据库异常处理 commit 21b65da Author: TongLei <[email protected]> Date: Thu Jul 14 19:08:02 2016 +0800 1、修改了大华SDK中文件路径的问题。 2、修改了视频文件查询的结构。 commit 1ef7c38 Merge: 5637a4f 6e6619a Author: kenny zhang <[email protected]> Date: Thu Jul 14 18:04:57 2016 +0800 Merge pull request #77 from anyboo/transation 端口扫描类和调用说明 commit 6e6619a Author: mk-z <[email protected]> Date: Thu Jul 14 18:02:46 2016 +0800 端口扫描类和调用说明 commit 5637a4f Merge: 77455a2 3b09634 Author: kenny zhang <[email protected]> Date: Thu Jul 14 11:46:45 2016 +0800 Merge pull request #76 from anyboo/transation 添加文件数据库，修改数据库说明，内存数据库单例模式修改 commit 3b09634 Author: mk-z <[email protected]> Date: Thu Jul 14 10:58:40 2016 +0800 添加文件数据库，修改数据库说明，内存数据库单例模式修改 commit 6212e85 Author: TongLei <[email protected]> Date: Thu Jul 14 09:06:39 2016 +0800 完成视频文件查询的基本流程。 commit 77455a2 Merge: a932ee3 5aa5749 Author: kenny zhang <[email protected]> Date: Wed Jul 13 14:31:25 2016 +0800 Merge pull request #75 from anyboo/transation 修改插入数据库慢的问题 commit 5aa5749 Author: mk-z <[email protected]> Date: Wed Jul 13 14:27:49 2016 +0800 修改插入数据库慢的问题 commit 5a93d06 Author: TongLei <[email protected]> Date: Tue Jul 12 21:25:42 2016 +0800 完成了单文件下载的功能。 commit a932ee3 Merge: 4f01163 7da0118 Author: kenny zhang <[email protected]> Date: Tue Jul 12 17:47:17 2016 +0800 Merge pull request #74 from anyboo/transation Transation commit 7da0118 Author: mk-z <[email protected]> Date: Tue Jul 12 17:45:23 2016 +0800 修改命名空间的问题 commit 68fd5c3 Author: mk-z <[email protected]> Date: Tue Jul 12 17:16:22 2016 +0800 完成端口扫描模块代码 commit 475bdac Author: TongLei <[email protected]> Date: Tue Jul 12 14:53:18 2016 +0800 添加了视频下载模块的输出接口 commit 5be8a40 Author: TongLei <[email protected]> Date: Mon Jul 11 20:13:24 2016 +0800 1、实现了将SDK中得到的文件大小以及总文件大小发送到视频下载的业务层。 2、完善文件下载的部分功能。 commit 55a8039 Author: mk-z <[email protected]> Date: Mon Jul 11 20:07:32 2016 +0800 端口扫描完整代码，但有错误未修改 commit c6999b0 Author: TongLei <[email protected]> Date: Mon Jul 11 11:11:23 2016 +0800 添加了停止下载的抽象基类接口；增加了视频下载业务模块。 commit 105c74a Merge: 399ae5c 2c94e0b Author: mk-z <[email protected]> Date: Mon Jul 11 09:23:02 2016 +0800 Merge branch 'transation' of https://github.com/anyboo/uilib into transation commit 399ae5c Author: mk-z <[email protected]> Date: Mon Jul 11 09:20:59 2016 +0800 端口扫描类代码 commit f0e1e8d Author: TongLei <[email protected]> Date: Thu Jul 7 14:48:56 2016 +0800 修改了大华和海康的公共函数接口。 commit 7b20402 Author: TongLei <[email protected]> Date: Wed Jul 6 11:49:14 2016 +0800 1、增加了海康和大华的抽象基类的接口。 2、将海康和大华的SDK的共用头文件分离开来。 3、修改业务中视频文件查询的接口。 commit 4f01163 Merge: 0908ab3 2c94e0b Author: kenny zhang <[email protected]> Date: Wed Jul 6 10:28:20 2016 +0800 Merge pull request #73 from anyboo/transation Transation commit 2c94e0b Author: kenny zhang <[email protected]> Date: Wed Jul 6 10:27:20 2016 +0800 Update ipset.txt 添加头文件 commit 7e929c1 Author: mk-z <[email protected]> Date: Wed Jul 6 10:24:18 2016 +0800 添加ip设置说明 commit 69a9fb8 Author: TongLei <[email protected]> Date: Wed Jul 6 10:11:20 2016 +0800 大华添加了查询设备的功能 commit a199aea Author: mk-z <[email protected]> Date: Tue Jul 5 18:38:15 2016 +0800 移植完成原ip设置 commit d716728 Author: mk-z <[email protected]> Date: Mon Jul 4 20:08:35 2016 +0800 添加获取默认设备 commit 28d257e Author: TongLei <[email protected]> Date: Mon Jul 4 19:50:03 2016 +0800 1、完成了业务模块视频查询的测试。 2、增加了SDK的公共头文件以及对一些接口进行修改。 commit 8ca05a3 Author: TongLei <[email protected]> Date: Mon Jul 4 14:56:32 2016 +0800 1、修复海康SDK的下载功能的问题 2、完成了将海康SDK中将文件信息写入到JSON文件的功能 3、完成了将海康SDK中将文件信息写入到数据库中的功能 commit 6a987f6 Author: mk-z <[email protected]> Date: Sat Jul 2 17:50:49 2016 +0800 ip设置 commit 0474b04 Author: TongLei <[email protected]> Date: Sat Jul 2 17:37:48 2016 +0800 完成了一部分海康SDK的封装。 commit 5e2b532 Author: TongLei <[email protected]> Date: Sat Jul 2 10:49:36 2016 +0800 在大华SDK中添加写入数据库分功能 commit b071aed Author: TongLei <[email protected]> Date: Fri Jul 1 22:23:42 2016 +0800 完成了海康的初始化、登录。 commit 8ffa46b Author: TongLei <[email protected]> Date: Fri Jul 1 16:47:30 2016 +0800 定义了海康SDK的接口 commit 0908ab3 Merge: 6a8d135 ad2b1f7 Author: kenny zhang <[email protected]> Date: Fri Jul 1 13:33:41 2016 +0800 Merge pull request #71 from anyboo/Tong_Lei Tong lei commit ad2b1f7 Author: TongLei <[email protected]> Date: Fri Jul 1 13:27:25 2016 +0800 修改文件查询的接口 commit edd6c13 Author: TongLei <[email protected]> Date: Fri Jul 1 11:44:37 2016 +0800 修改了大华的SDK的数据接口，以及完成部分文件查询的工作。 commit 75a3b78 Author: TongLei <[email protected]> Date: Fri Jul 1 11:07:16 2016 +0800 修改了内之间的结构 commit 2526361 Author: TongLei <[email protected]> Date: Fri Jul 1 10:39:38 2016 +0800 添加文件查询的业务模块 commit d94b7f0 Author: TongLei <[email protected]> Date: Fri Jul 1 10:32:13 2016 +0800 重新配置环境 commit 6a8d135 Merge: 8e527e6 0dbc915 Author: Kevin Yu <[email protected]> Date: Thu Jun 30 16:44:37 2016 +0800 Merge pull request #68 from anyboo/DownloaderUI Downloader ui commit 8e527e6 Merge: b03f3e7 6cc4d28 Author: Kevin Yu <[email protected]> Date: Thu Jun 30 16:44:21 2016 +0800 Merge pull request #69 from anyboo/DZP_SDK Dzp sdk commit b03f3e7 Merge: d225914 b3ed6ee Author: kenny zhang <[email protected]> Date: Thu Jun 30 16:25:28 2016 +0800 Merge pull request #70 from anyboo/transation 添加头文件包含说明 commit b3ed6ee Author: mk-z <[email protected]> Date: Thu Jun 30 16:23:38 2016 +0800 添加头文件包含说明 commit 0dbc915 Author: wwang13 <[email protected]> Date: Thu Jun 30 15:49:34 2016 +0800 Modify the full screen issues commit d225914 Merge: ff4c5ce 2ba12ca Author: kenny zhang <[email protected]> Date: Thu Jun 30 15:44:02 2016 +0800 Merge pull request #67 from anyboo/transation Transation commit 2ba12ca Author: mk-z <[email protected]> Date: Thu Jun 30 15:38:21 2016 +0800 完善厂商查询，将debug模式写到memory.db commit 59bb09d Author: mk-z <[email protected]> Date: Thu Jun 30 09:19:20 2016 +0800 删除多余的代码 commit 1c1d76c Author: wwang13 <[email protected]> Date: Wed Jun 29 19:29:26 2016 +0800 2016/06/29 commit ff4c5ce Merge: 2afe479 92a3835 Author: kenny zhang <[email protected]> Date: Wed Jun 29 19:06:52 2016 +0800 Merge pull request #66 from anyboo/transation 修改读和写数据函数的参数 commit 92a3835 Author: mk-z <[email protected]> Date: Wed Jun 29 19:05:10 2016 +0800 修改读和写数据函数的参数 commit c4e2e6a Author: wwang13 <[email protected]> Date: Tue Jun 28 17:06:40 2016 +0800 add Vendor and channel List show code and add other tools window commit d1725c0 Author: wwang13 <[email protected]> Date: Mon Jun 27 19:44:53 2016 +0800 2016/06/27 # Conflicts: # TRobot/Robot/AbstractVendor.h # TRobot/Robot/CommonUtrl.cpp # TRobot/Robot/DHVendor/DHVendor.cpp # TRobot/Robot/DHVendor/DHVendor.h # TRobot/Robot/DZPVendor/DZPVendor.cpp # TRobot/Robot/DZPVendor/DZPVendor.h # TRobot/Robot/Device.cpp # TRobot/Robot/Device.h # TRobot/Robot/DeviceManager.cpp # TRobot/Robot/DeviceManager.h # TRobot/Robot/HKVendor/HKVendor.cpp # TRobot/Robot/HKVendor/HKVendor.h # TRobot/Robot/JxjVendor/JxjVendor.cpp # TRobot/Robot/JxjVendor/JxjVendor.h # TRobot/Robot/Log/JAVDec.txt # TRobot/Robot/Log/JNetSDK.txt # TRobot/Robot/LoginDevice.cpp # TRobot/Robot/LoginDevice.h # TRobot/Robot/Network/PING.cpp # TRobot/Robot/Network/PING.h # TRobot/Robot/Robot.cpp # TRobot/Robot/Robot.vcxproj # TRobot/Robot/Robot.vcxproj.filters # TRobot/Robot/SearchDevice.cpp # TRobot/Robot/SearchFileList.config # TRobot/Robot/memory.db # TRobot/Robot/phoenix.db # TRobot/Robot/x86/IvsDrawer.dll # TRobot/Robot/x86/aacdec.dll # TRobot/Robot/x86/amrdec.dll # TRobot/Robot/x86/dhconfigsdk.dll # TRobot/Robot/x86/dhnetsdk.h # TRobot/Robot/x86/dhplay.dll # TRobot/Robot/x86/h264dec.dll # TRobot/Robot/x86/mjpegdec.dll # TRobot/Robot/x86/mp3dec.dll # TRobot/Robot/x86/mpeg4dec.dll # TRobot/Robot/x86/mpeg4enc.dll # TRobot/Robot/x86/postproc.dll # x86/DH/dhnetsdk.dll # x86/Robot_d.exe commit bd3d71d Author: zhoujiechj <[email protected]> Date: Mon Jul 18 17:57:49 2016 +0800 更改portscan等文件的目录位置 commit 76c2edc Author: zhoujiechj <[email protected]> Date: Mon Jul 18 16:07:35 2016 +0800 删除EXE文件 commit 393b940 Author: zhoujiechj <[email protected]> Date: Mon Jul 18 16:02:09 2016 +0800 与童磊合并sdk commit 99c567f Author: zhoujiechj <[email protected]> Date: Fri Jul 15 19:47:14 2016 +0800 整合端口扫描业务流程 commit 769067e Author: zhoujiechj <[email protected]> Date: Thu Jul 14 18:19:04 2016 +0800 完善 “设备发现”、“设备登陆” 业务流程，新增 “设备管理” 业务： 1、“设备发现” 将之前的阻塞型改为非阻塞型，即使用Poco库的线程池，管理“设备发现”业务类； 2、“设备登陆” 业务增加“登陆设备时写设备信息到数据库，登出设备则从数据库删除设备设备信息”，用于“当主程序退出时，重新开启程序可以自动重新登陆之前已登陆的设备的情况”； 3、新增 “设备管理” 业务，即完成第2条中说的“自动重新登陆”的功能，包括“程序重新登陆上次退出程序时已登陆设备”和“重新登陆断开连接的设备”的功能 commit 7b484ef Author: zhoujiechj <[email protected]> Date: Tue Jul 12 21:26:27 2016 +0800 新增 “设备搜索” 线程轮询部分 commit 51be435 Author: zhoujiechj <[email protected]> Date: Mon Jul 11 20:10:46 2016 +0800 测试下载文件回调函数的 “消息通知” 功能 commit 2d7c5a8 Author: zhoujiechj <[email protected]> Date: Fri Jul 8 11:12:17 2016 +0800 修改jxj SDK 类名CJxjVendor 为 CJXJVendor commit 0d37b76 Author: zhoujiechj <[email protected]> Date: Fri Jul 8 10:45:16 2016 +0800 设备发现、设备登陆、文件搜索 合并 commit c619632 Author: zhoujiechj <[email protected]> Date: Thu Jul 7 20:59:32 2016 +0800 完善 “文件播放” 测试部分 commit 33e5129 Author: zhoujiechj <[email protected]> Date: Thu Jul 7 17:56:22 2016 +0800 测试 “文件搜索” 业务流程： 1、整合童磊的文件搜索类SearchVideo，梳理流程 “设备发现-设备登陆-文件搜索”； commit d0b1a26 Author: zhoujiechj <[email protected]> Date: Thu Jul 7 16:11:17 2016 +0800 完善 “设备发现和设备登陆” 业务流程： 1、增加“有设备发现功能”和“没有设备发现功能”的流程，实现获取到目前已做的4个SDK的设备数量及相关信息的功能，其中佳信捷、迪智普、大华等SDK有设备发现功能，海康SDK没有设备发现功能； 2、合并之前的“设备管理类DeviceManager”到“设备登陆类LoginDevice”中，统一管理登陆成功的设备（有别于设备发现阶段的试探性登陆）； commit b6aefcb Author: zhoujiechj <[email protected]> Date: Wed Jul 6 20:12:50 2016 +0800 完善 “设备发现中的循环登陆扫描设备” 部分： 1、使用责任链的设计模式，在Device类中增加相应责任链机制，完成“循环登陆扫描设备”的功能，连续sdk登陆有登陆时的错误，该问题在验证； commit 4b4c160 Author: zhoujiechj <[email protected]> Date: Wed Jul 6 17:19:13 2016 +0800 合并 大华、海康SDK（漏掉一些新增文件）： 1、将各Vendor头文件中有关的各自底层sdk相关的变量、函数移植到相应的cpp文件，解决之前不同sdk厂商使用相似头文件造成重定义的问题； 2、取消使用各自sdk厂商生成静态库lib的方法，回复到之前类的方式调用各自sdk的方法 commit ce5d47d Author: zhoujiechj <[email protected]> Date: Wed Jul 6 17:10:27 2016 +0800 合并 大华、海康SDK： 1、将各Vendor头文件中有关的各自底层sdk相关的变量、函数移植到相应的cpp文件，解决之前不同sdk厂商使用相似头文件造成重定义的问题； 2、取消使用各自sdk厂商生成静态库lib的方法，回复到之前类的方式调用各自sdk的方法 commit 31e2973 Author: zhoujiechj <[email protected]> Date: Tue Jul 5 20:29:02 2016 +0800 新增部分 “轮循登陆查找设备” 的功能 commit 4c227b9 Author: zhoujiechj <[email protected]> Date: Tue Jul 5 17:00:46 2016 +0800 梳理 “设备发现”、“设备登陆” 业务流程 commit e49ec98 Author: zhoujiechj <[email protected]> Date: Mon Jul 4 19:56:23 2016 +0800 1、将佳信捷SDK和迪智普SDK生产静态库JXJVendor.lib和DZPVendor.lib，解决sdk头文件中结构体或者函数重定义的问题； 2、完善各SDK头文件引用； commit 2dbc034 Author: zhoujiechj <[email protected]> Date: Sat Jul 2 16:02:49 2016 +0800 新增“设备发现”、“设备登陆”、“设备搜索”的业务流程： 1、设备发现只处理佳信捷和迪智普SDK; 2、设备登陆、设备搜索测试了佳信捷SDK; commit 832b6fa Author: zhoujiechj <[email protected]> Date: Sat Jul 2 10:39:27 2016 +0800 新增 佳信捷和迪智普SDK合并文件清单.txt commit 338e716 Author: zhoujiechj <[email protected]> Date: Fri Jul 1 22:24:30 2016 +0800 新增已有设备搜索流程 commit fc73567 Author: zhoujiechj <[email protected]> Date: Thu Jun 30 21:17:02 2016 +0800 新增迪智浦SDK 搜索、下载 接口 # Conflicts: # TRobot/Robot/AbstractVendor.h # TRobot/Robot/AcquireSerachFileData.cpp # TRobot/Robot/CommonUtrl.cpp # TRobot/Robot/CommonUtrl.h # TRobot/Robot/DHVendor/DHVendor.cpp # TRobot/Robot/DHVendor/DHVendor.h # TRobot/Robot/DZPVendor/DZPVendor.cpp # TRobot/Robot/DZPVendor/DZPVendor.h # TRobot/Robot/Device.cpp # TRobot/Robot/Device.h # TRobot/Robot/JxjVendor/JxjVendor.cpp # TRobot/Robot/JxjVendor/JxjVendor.h # TRobot/Robot/Log/JAVDec.txt # TRobot/Robot/Log/JNetSDK.txt # TRobot/Robot/LoginDevice.cpp # TRobot/Robot/LoginDevice.h # TRobot/Robot/Network/WindowUtils.cpp # TRobot/Robot/Network/windowutils.cpp # TRobot/Robot/Robot.cpp # TRobot/Robot/Robot.vcxproj # TRobot/Robot/Robot.vcxproj.filters # TRobot/Robot/SearchDevice.cpp # TRobot/Robot/SearchFileException.cpp # TRobot/Robot/SearchFileList.config # TRobot/Robot/SearchFileWorker.cpp # TRobot/Robot/SearchFileWorker.h # TRobot/Robot/TestWindows.cpp # TRobot/Robot/TestWindows.h # transation/QMSqlite.h
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
新增“设备发现”、“设备登陆”、“设备搜索”的业务流程：
1、设备发现只处理佳信捷和迪智普SDK;
2、设备登陆、设备搜索测试了佳信捷SDK;