From ae5a02a4428be27d69c1fe8791ec83bce3827e80 Mon Sep 17 00:00:00 2001
From: chenke <chenke@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期三, 09 八月 2017 13:07:06 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/DictionaryMng.java | 31 ++++++++++++++++++++-----------
1 files changed, 20 insertions(+), 11 deletions(-)
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 184f049..2dd297c 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
@@ -2,15 +2,6 @@
import android.widget.Toast;
-import cn.com.basic.face.base.BaseApplication;
-import cn.com.basic.face.base.MainActivity;
-import cn.com.basic.face.dialog.CountryDialog;
-import cn.com.basic.face.dialog.SelectDialog;
-import cn.com.basic.face.discern.query.condition.DictionaryQueryCondition;
-import cn.com.basic.face.service.sqlite.DictionaryDao;
-import cn.com.basic.face.service.sqlite.TestDao;
-import cn.com.basic.face.util.AppApi;
-
import org.xutils.http.RequestParams;
import org.xutils.x;
@@ -19,13 +10,21 @@
import java.util.Comparator;
import java.util.HashMap;
import java.util.List;
-import java.util.Map;
+import cn.com.basic.face.base.BaseApplication;
+import cn.com.basic.face.base.MainActivity;
+import cn.com.basic.face.dialog.CountryDialog;
+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 {
@@ -39,7 +38,6 @@
if (!BaseApplication.deviceAvailable) {
return;
}
- TestDao.getInstance().test();
loadCountries();
loadIdTypeList();
loadGenderList();
@@ -60,6 +58,7 @@
if (BaseApplication.getInstance().networkAvailable()) {
RequestParams params = new RequestParams(AppApi.BASE_URL +AppApi.Query.DICTIONARY_QUERY);
params.addParameter(DictionaryQueryCondition.FieldNames.type, CommonVariables.DictionaryType.COUNTRY);
+ params.addBodyParameter("deviceCompanyId", BaseApplication.getInstance().getAndroidDevice().getCompanyId());
x.http().get(params, new BaseCommonCallBack() {
public void success() {
loadCountriesAfterReturn(getList(Dictionary.class));
@@ -122,6 +121,7 @@
if (BaseApplication.getInstance().networkAvailable()) {
RequestParams params = new RequestParams(AppApi.BASE_URL +AppApi.Query.DICTIONARY_QUERY);
params.addParameter(DictionaryQueryCondition.FieldNames.type, CommonVariables.DictionaryType.ID_TYPE);
+ params.addBodyParameter("deviceCompanyId", BaseApplication.getInstance().getAndroidDevice().getCompanyId());
x.http().get(params, new BaseCommonCallBack() {
public void success() {
SelectDialog.setIdTypeList(getDictionaryNameList(getList(Dictionary.class)));
@@ -139,6 +139,7 @@
if (BaseApplication.getInstance().networkAvailable()) {
RequestParams params = new RequestParams(AppApi.BASE_URL +AppApi.Query.DICTIONARY_QUERY);
params.addParameter(DictionaryQueryCondition.FieldNames.type, CommonVariables.DictionaryType.GENDER);
+ params.addBodyParameter("deviceCompanyId", BaseApplication.getInstance().getAndroidDevice().getCompanyId());
x.http().get(params, new BaseCommonCallBack() {
public void success() {
SelectDialog.setGenderList(getDictionaryNameList(getList(Dictionary.class)));
@@ -156,6 +157,7 @@
if (BaseApplication.getInstance().networkAvailable()) {
RequestParams params = new RequestParams(AppApi.BASE_URL +AppApi.Query.DICTIONARY_QUERY);
params.addParameter(DictionaryQueryCondition.FieldNames.type, CommonVariables.DictionaryType.VISIT_REASON);
+ params.addBodyParameter("deviceCompanyId", BaseApplication.getInstance().getAndroidDevice().getCompanyId());
x.http().get(params, new BaseCommonCallBack() {
public void success() {
SelectDialog.setVisitReasonList(getDictionaryNameList(getList(Dictionary.class)));
@@ -173,6 +175,7 @@
if (BaseApplication.getInstance().networkAvailable()) {
RequestParams params = new RequestParams(AppApi.BASE_URL +AppApi.Query.DICTIONARY_QUERY);
params.addParameter(DictionaryQueryCondition.FieldNames.type, CommonVariables.DictionaryType.RESOLUTION);
+ params.addBodyParameter("deviceCompanyId", BaseApplication.getInstance().getAndroidDevice().getCompanyId());
x.http().get(params, new BaseCommonCallBack() {
public void success() {
SelectDialog.setResolutionList(getDictionaryNameList(getList(Dictionary.class)));
@@ -190,6 +193,7 @@
if (BaseApplication.getInstance().networkAvailable()) {
RequestParams params = new RequestParams(AppApi.BASE_URL +AppApi.Query.DICTIONARY_QUERY);
params.addParameter(DictionaryQueryCondition.FieldNames.type, CommonVariables.DictionaryType.PROTOCOL);
+ params.addBodyParameter("deviceCompanyId", BaseApplication.getInstance().getAndroidDevice().getCompanyId());
x.http().get(params, new BaseCommonCallBack() {
public void success() {
SelectDialog.setProtocolList(getDictionaryNameList(getList(Dictionary.class)));
@@ -207,6 +211,7 @@
if (BaseApplication.getInstance().networkAvailable()) {
RequestParams params = new RequestParams(AppApi.BASE_URL +AppApi.Query.DICTIONARY_QUERY);
params.addParameter(DictionaryQueryCondition.FieldNames.type, CommonVariables.DictionaryType.CAMERA_BRAND);
+ params.addBodyParameter("deviceCompanyId", BaseApplication.getInstance().getAndroidDevice().getCompanyId());
x.http().get(params, new BaseCommonCallBack() {
public void success() {
SelectDialog.setCameraBrandList(getDictionaryNameList(getList(Dictionary.class)));
@@ -224,6 +229,7 @@
if (BaseApplication.getInstance().networkAvailable()) {
RequestParams params = new RequestParams(AppApi.BASE_URL +AppApi.Query.DICTIONARY_QUERY);
params.addParameter(DictionaryQueryCondition.FieldNames.type, CommonVariables.DictionaryType.VISITOR_TYPE);
+ params.addBodyParameter("deviceCompanyId", BaseApplication.getInstance().getAndroidDevice().getCompanyId());
x.http().get(params, new BaseCommonCallBack() {
public void success() {
SelectDialog.setVisitorTypeList(getDictionaryNameList(getList(Dictionary.class)));
@@ -242,6 +248,7 @@
if (BaseApplication.getInstance().networkAvailable()) {
RequestParams params = new RequestParams(AppApi.BASE_URL +AppApi.Query.DICTIONARY_QUERY);
params.addParameter(DictionaryQueryCondition.FieldNames.type, CommonVariables.DictionaryType.ATTENDER_TYPE);
+ params.addBodyParameter("deviceCompanyId", BaseApplication.getInstance().getAndroidDevice().getCompanyId());
x.http().get(params, new BaseCommonCallBack() {
public void success() {
SelectDialog.setAttenderTypeList(getDictionaryNameList(getList(Dictionary.class)));
@@ -261,8 +268,10 @@
params.addBodyParameter(Dictionary.FieldNames.type, type1);
params.addBodyParameter(Dictionary.FieldNames.name, name);
params.addBodyParameter(Dictionary.FieldNames.orderBy, "10");
+ params.addBodyParameter("deviceCompanyId", BaseApplication.getInstance().getAndroidDevice().getCompanyId());
x.http().post(params, new BaseCommonCallBack() {
public void success() {
+ SqliteSqlUtil.insert(getExtraList(SqliteSqlBean.class));
addDictionaryAfterReturn(getList(Dictionary.class), type);
}
});
--
Gitblit v1.8.0