From 8a2248ee99e027ddd09af209f30304925b2d998c Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期六, 22 七月 2017 14:12:01 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/PhoneCallMng.java | 3 +
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/SurveillanceMng.java | 3 +
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/common/SqliteSqlBean.java | 35 +++++++++++++++++
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/DeviceDao.java | 4 +-
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/base/MainActivity.java | 2
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/RegisterMng.java | 5 ++
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/common/BaseCommonCallBack.java | 11 +++++
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/DictionaryMng.java | 3 +
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/common/ResultBean.java | 9 ++++
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/CheckInMng.java | 3 +
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/SqliteSqlUtil.java | 23 +++++++++++
11 files changed, 98 insertions(+), 3 deletions(-)
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/base/MainActivity.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/base/MainActivity.java
index 4941c9a..1c8b848 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/base/MainActivity.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/base/MainActivity.java
@@ -345,7 +345,7 @@
sDensity = getResources().getDisplayMetrics().scaledDensity;
String s = FileUtil.getStringFromFile("/system/a");
- int res = FSDK.ActivateLibrary("bSB3NdbTnv/0eW/uhypSe6hDMtjZ76Sisw5NwcN+0sfahxOtoUW22el54e/M6cSG5/xsdVIorPgugbTIfoIIn7ltyw1QMSleNebVx/Xe8aRA8bP+aVDybjoWdW/0rDP9Pv7yqBzNXyuwjgsVhPB53VGP8oTirTSUP7PTzSwOEe0=");
+ int res = FSDK.ActivateLibrary(s);
if (res != FSDK.FSDKE_OK) {
mIsFailed = true;
showErrorAndClose("failed", res);
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/common/BaseCommonCallBack.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/common/BaseCommonCallBack.java
index e16c108..653bdbc 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/common/BaseCommonCallBack.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/common/BaseCommonCallBack.java
@@ -40,6 +40,17 @@
return null;
}
+ public <T> List<T> getExtraList(Class<T> requiredType) {
+ Object data = resultBean.getExtraData();
+ if (data != null) {
+ if (data instanceof JSONArray) {
+ JSONArray jsonArray = (JSONArray) data;
+ return JSON.parseArray(jsonArray.toJSONString(), requiredType);
+ }
+ }
+ return null;
+ }
+
@Override
public void onSuccess(ResultBean resultBean) {
this.resultBean = resultBean;
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/common/ResultBean.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/common/ResultBean.java
index 1f2a40d..c285924 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/common/ResultBean.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/common/ResultBean.java
@@ -16,6 +16,7 @@
private Object data;
private int totalPages;
private int pageNum;
+ private Object extraData;
public String getCode() {
@@ -87,4 +88,12 @@
public boolean hasMorePages() {
return getPageNum() < getTotalPages();
}
+
+ public Object getExtraData() {
+ return extraData;
+ }
+
+ public void setExtraData(Object extraData) {
+ this.extraData = extraData;
+ }
}
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/common/SqliteSqlBean.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/common/SqliteSqlBean.java
new file mode 100644
index 0000000..a047680
--- /dev/null
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/common/SqliteSqlBean.java
@@ -0,0 +1,35 @@
+package cn.com.basic.face.discern.common;
+
+public class SqliteSqlBean {
+
+ private String primaryKeyColumn;
+ private String primaryKeyValue;
+ private String insertSql;
+ private String tableName;
+
+ public String getPrimaryKeyColumn() {
+ return primaryKeyColumn;
+ }
+ public void setPrimaryKeyColumn(String primaryKeyColumn) {
+ this.primaryKeyColumn = primaryKeyColumn;
+ }
+ public String getInsertSql() {
+ return insertSql;
+ }
+ public void setInsertSql(String insertSql) {
+ this.insertSql = insertSql;
+ }
+ public String getTableName() {
+ return tableName;
+ }
+ public void setTableName(String tableName) {
+ this.tableName = tableName;
+ }
+ public String getPrimaryKeyValue() {
+ return primaryKeyValue;
+ }
+ public void setPrimaryKeyValue(String primaryKeyValue) {
+ this.primaryKeyValue = primaryKeyValue;
+ }
+
+}
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/CheckInMng.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/CheckInMng.java
index f5d4cd8..4b40e2a 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/CheckInMng.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/CheckInMng.java
@@ -5,6 +5,7 @@
import cn.com.basic.face.base.BaseApplication;
import cn.com.basic.face.discern.common.CommonVariables;
import cn.com.basic.face.discern.common.ResultBean;
+import cn.com.basic.face.discern.common.SqliteSqlBean;
import cn.com.basic.face.discern.entity.Visit;
import cn.com.basic.face.discern.entity.VisitDetail;
import cn.com.basic.face.discern.query.condition.CheckInQueryCondition;
@@ -26,6 +27,7 @@
import cn.com.basic.face.discern.common.BaseCommonCallBack;
import cn.com.basic.face.discern.query.item.CheckInQueryItem;
import cn.com.basic.face.util.CharacterParser;
+import cn.com.basic.face.util.SqliteSqlUtil;
//鐧昏
public class CheckInMng extends BaseMng {
@@ -45,6 +47,7 @@
x.http().post(params, new BaseCommonCallBack() {
@Override
public void success() {
+ SqliteSqlUtil.insert(getExtraList(SqliteSqlBean.class));
Toast.makeText(BaseApplication.getInstance(),"娣诲姞鎴愬姛", Toast.LENGTH_SHORT).show();
CheckInFragment.getInstance().resetForm();
if (visitReasonId == null || "".equals(visitReasonId)) {
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/DictionaryMng.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/DictionaryMng.java
index 8ecbaec..5a60e71 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/DictionaryMng.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/DictionaryMng.java
@@ -17,12 +17,14 @@
import cn.com.basic.face.dialog.SelectDialog;
import cn.com.basic.face.discern.common.BaseCommonCallBack;
import cn.com.basic.face.discern.common.CommonVariables;
+import cn.com.basic.face.discern.common.SqliteSqlBean;
import cn.com.basic.face.discern.entity.Dictionary;
import cn.com.basic.face.discern.query.condition.DictionaryQueryCondition;
import cn.com.basic.face.service.sqlite.DictionaryDao;
import cn.com.basic.face.util.AppApi;
import cn.com.basic.face.util.CharacterParser;
import cn.com.basic.face.util.Constant;
+import cn.com.basic.face.util.SqliteSqlUtil;
public class DictionaryMng extends BaseMng {
@@ -259,6 +261,7 @@
params.addBodyParameter(Dictionary.FieldNames.orderBy, "10");
x.http().post(params, new BaseCommonCallBack() {
public void success() {
+ SqliteSqlUtil.insert(getExtraList(SqliteSqlBean.class));
addDictionaryAfterReturn(getList(Dictionary.class), type);
}
});
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/PhoneCallMng.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/PhoneCallMng.java
index 36f2cf7..f5116d2 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/PhoneCallMng.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/PhoneCallMng.java
@@ -17,6 +17,7 @@
import cn.com.basic.face.discern.common.BaseCommonCallBack;
import cn.com.basic.face.discern.common.CommonVariables;
import cn.com.basic.face.discern.common.ResultBean;
+import cn.com.basic.face.discern.common.SqliteSqlBean;
import cn.com.basic.face.discern.entity.PhoneCall;
import cn.com.basic.face.discern.query.condition.PhoneCallQueryCondition;
import cn.com.basic.face.discern.query.item.CheckInQueryItem;
@@ -25,6 +26,7 @@
import cn.com.basic.face.service.sqlite.PhoneCallDao;
import cn.com.basic.face.util.AppApi;
import cn.com.basic.face.util.CharacterParser;
+import cn.com.basic.face.util.SqliteSqlUtil;
public class PhoneCallMng extends BaseMng {
@@ -144,6 +146,7 @@
params.addBodyParameter(PhoneCall.FieldNames.callerId, visitor.getRegisterId());
x.http().post(params, new BaseCommonCallBack() {
public void success() {
+ SqliteSqlUtil.insert(getExtraList(SqliteSqlBean.class));
}
});
} else {
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/RegisterMng.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/RegisterMng.java
index 9fba7b2..b195e77 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/RegisterMng.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/RegisterMng.java
@@ -6,6 +6,7 @@
import cn.com.basic.face.base.BaseApplication;
import cn.com.basic.face.base.MainActivity;
import cn.com.basic.face.discern.common.CommonVariables;
+import cn.com.basic.face.discern.common.SqliteSqlBean;
import cn.com.basic.face.discern.entity.Register;
import cn.com.basic.face.discern.query.item.OfflineAttenderRegisterItem;
import cn.com.basic.face.discern.query.item.OfflineVisitorRegisterItem;
@@ -28,6 +29,7 @@
import cn.com.basic.face.util.FileUtil;
import cn.com.basic.face.util.IdCard;
import cn.com.basic.face.util.NativeImg;
+import cn.com.basic.face.util.SqliteSqlUtil;
public class RegisterMng {
@@ -84,6 +86,7 @@
x.http().post(params, new BaseCommonCallBack() {
@Override
public void success() {
+ SqliteSqlUtil.insert(getExtraList(SqliteSqlBean.class));
Toast.makeText(BaseApplication.getInstance(),"娣诲姞鎴愬姛", Toast.LENGTH_SHORT).show();
VisitorRegisterFragment.getInstance().resetForm();
MainActivity.selectPage(2);
@@ -210,6 +213,7 @@
x.http().post(params, new BaseCommonCallBack() {
@Override
public void success() {
+ SqliteSqlUtil.insert(getExtraList(SqliteSqlBean.class));
Toast.makeText(BaseApplication.getInstance(),"娣诲姞鎴愬姛", Toast.LENGTH_SHORT).show();
AttenderRegisterFragment.getInstance().resetForm();
}
@@ -261,6 +265,7 @@
x.http().post(params, new BaseCommonCallBack() {
@Override
public void success() {
+ SqliteSqlUtil.insert(getExtraList(SqliteSqlBean.class));
Toast.makeText(BaseApplication.getInstance(),"娣诲姞鎴愬姛", Toast.LENGTH_SHORT).show();
VisitorRegisterFragment.getInstance().resetForm();
RegisterDao.getInstance().removeOfflineVisitorRegister(item);
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/SurveillanceMng.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/SurveillanceMng.java
index c101c69..99d7ae9 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/SurveillanceMng.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/SurveillanceMng.java
@@ -11,11 +11,13 @@
import cn.com.basic.face.base.MainActivity;
import cn.com.basic.face.discern.common.BaseCommonCallBack;
import cn.com.basic.face.discern.common.CommonVariables;
+import cn.com.basic.face.discern.common.SqliteSqlBean;
import cn.com.basic.face.discern.query.item.SurveillanceQueryItem;
import cn.com.basic.face.discern.query.item.UnknownQueryItem;
import cn.com.basic.face.service.sqlite.SurveillanceDao;
import cn.com.basic.face.util.AppApi;
import cn.com.basic.face.util.FileUtil;
+import cn.com.basic.face.util.SqliteSqlUtil;
import cn.com.basic.face.util.SurveillanceQueryItemUtil;
import cn.com.basic.face.util.UnknownSurveillanceQueryItemUtil;
@@ -95,6 +97,7 @@
@Override
public void success() {
try {
+ SqliteSqlUtil.insert(getExtraList(SqliteSqlBean.class));
SurveillanceQueryItemUtil.getInstance().addItems(resultBean.getList(SurveillanceQueryItem.class), bitmapList, cameraInOrOut);
} catch(Exception e) {
e.printStackTrace();
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 a295e32..aace98a 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
@@ -58,7 +58,7 @@
aqi.setCompanyId(c.getString((c.getColumnIndex("company_id"))));
aqi.setDeviceName(c.getString((c.getColumnIndex("device_name"))));
aqi.setType(c.getString(c.getColumnIndex("type")));
- aqi.setInstallAdress(c.getString((c.getColumnIndex("install_address"))));
+ aqi.setInstallAddress(c.getString((c.getColumnIndex("install_address"))));
aqi.setSchoolName(c.getString((c.getColumnIndex("school_name"))));
aqi.setBrandId(c.getString(c.getColumnIndex("brand_id")));
aqi.setIp(c.getString(c.getColumnIndex("ip")));
@@ -117,7 +117,7 @@
aqi.setCompanyId(c.getString((c.getColumnIndex("company_id"))));
aqi.setDeviceName(c.getString((c.getColumnIndex("device_name"))));
aqi.setType(c.getString(c.getColumnIndex("type")));
- aqi.setInstallAdress(c.getString((c.getColumnIndex("install_address"))));
+ aqi.setInstallAddress(c.getString((c.getColumnIndex("install_address"))));
aqi.setSchoolName(c.getString((c.getColumnIndex("school_name"))));
aqi.setBrandId(c.getString(c.getColumnIndex("brand_id")));
aqi.setIp(c.getString(c.getColumnIndex("ip")));
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/SqliteSqlUtil.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/SqliteSqlUtil.java
new file mode 100644
index 0000000..95a5882
--- /dev/null
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/SqliteSqlUtil.java
@@ -0,0 +1,23 @@
+package cn.com.basic.face.util;
+
+import java.util.List;
+
+import cn.com.basic.face.base.MainActivity;
+import cn.com.basic.face.discern.common.SqliteSqlBean;
+
+public class SqliteSqlUtil {
+
+ public static void insert(List<SqliteSqlBean> sqliteSqlBeenList) {
+ if (sqliteSqlBeenList == null) {
+ return;
+ }
+ try {
+ for (SqliteSqlBean SqliteSqlBean : sqliteSqlBeenList) {
+ MainActivity.getInstance().db.execSQL(SqliteSqlBean.getInsertSql());
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+
+}
--
Gitblit v1.8.0