From 1ec5ff7b1443e4b205b953875fd876fd6e76fce0 Mon Sep 17 00:00:00 2001
From: pans <pans@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期三, 09 八月 2017 12:22:33 +0800
Subject: [PATCH] capnproto update to 7.0dev
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/DeviceDao.java | 44 ++++++++++++++++++++++++++++++++++++--------
1 files changed, 36 insertions(+), 8 deletions(-)
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/DeviceDao.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/DeviceDao.java
index edc8852..704e120 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/DeviceDao.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/DeviceDao.java
@@ -1,5 +1,6 @@
package cn.com.basic.face.service.sqlite;
+import android.content.ContentValues;
import android.database.Cursor;
import java.util.ArrayList;
@@ -7,6 +8,7 @@
import cn.com.basic.face.base.MainActivity;
import cn.com.basic.face.discern.entity.Device;
+import cn.com.basic.face.discern.query.item.DeviceQueryItem;
/**
* 璁惧Dao
@@ -81,9 +83,9 @@
* @param belongId 鎵�灞炶澶嘔d锛堜富璁惧锛�
* @return
*/
- public List<Device> loadCamera(String type, String belongId) {
+ public List<DeviceQueryItem> loadCamera(String type, String belongId) {
- List<Device> list = new ArrayList<Device>();
+ List<DeviceQueryItem> list = new ArrayList<DeviceQueryItem>();
try {
@@ -103,11 +105,11 @@
sb.append(" AND a.belong_id = ").append(belongId) ;
}
- Device aqi = null;
+ DeviceQueryItem aqi = null;
Cursor c = MainActivity.getInstance().db.rawQuery(sb.toString(), new String[]{});
while (c.moveToNext()) {
- aqi = new Device();
+ aqi = new DeviceQueryItem();
aqi.setDeviceId(c.getString(c.getColumnIndex("device_id")));
aqi.setCompanyId(c.getString((c.getColumnIndex("company_id"))));
aqi.setDeviceName(c.getString((c.getColumnIndex("device_name"))));
@@ -166,6 +168,8 @@
device.setType(c.getString(c.getColumnIndex("type")));
device.setSchoolName(c.getString(c.getColumnIndex("school_name")));
device.setScrappedDate(c.getString(c.getColumnIndex("scrapped_date")));
+ device.setIsValid(c.getString(c.getColumnIndex("is_valid")));
+ device.setCreateTime(c.getString(c.getColumnIndex("create_time")));
result.add(device);
}
return result;
@@ -173,8 +177,8 @@
//鍒犻櫎宸茬粡涓婁紶鍒版湇鍔″櫒鐨勫悓姝ユ暟鎹�
- public void delDevice(String deviceCompanyId){
- String sql="delete from device where is_synchron='N' and device_company_id="+Integer.parseInt(deviceCompanyId);
+ public void delDevice(){
+ String sql="delete from device where is_synchron='N'";
MainActivity.getInstance().db.execSQL(sql);
}
@@ -182,8 +186,32 @@
//鑾峰彇鏈悓姝ユ暟鎹�绘暟
public int getSynDataCount(){
String sql="select count(*) from device where is_synchron='N' ";
- Cursor c =MainActivity.getInstance().db.rawQuery(sql,new String[]{});
- return c.getCount();
+ Cursor c = MainActivity.getInstance().db.rawQuery(sql,new String[]{});
+ c.moveToFirst();
+ return c.getInt(0);
+ }
+
+ public void updateCamera(Device camera) {
+ String strFilter = "device_id=" + camera.getDeviceId();
+ ContentValues args = new ContentValues();
+ args.put("brand", camera.getBrand());
+ args.put("brand_id", camera.getBrandId());
+ args.put("ip", camera.getIp());
+ args.put("port", camera.getPort());
+ args.put("resolution", camera.getResolution());
+ args.put("resolutionId", camera.getResolutionId());
+ args.put("username", camera.getUsername());
+ args.put("password", camera.getPassword());
+ MainActivity.getInstance().db.update("device", args, strFilter, null);
+ }
+
+ public void updateAndroidDevice(Device androidDevice) {
+ String strFilter = "device_id=" + androidDevice.getDeviceId();
+ ContentValues args = new ContentValues();
+ args.put("school_name", androidDevice.getSchoolName());
+ args.put("sn", androidDevice.getSn());
+ args.put("install_address", androidDevice.getInstallAddress());
+ MainActivity.getInstance().db.update("device", args, strFilter, null);
}
}
--
Gitblit v1.8.0