From 477c75353c515a45ab31617e10b88c0d92bfa82a Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期六, 01 四月 2017 15:16:29 +0800
Subject: [PATCH] 

---
 /dev/null                                                                           |   48 ------------------------
 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/base/BaseApplication.java  |    2 -
 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/RegisterMng.java   |    2 
 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/DictionaryMng.java |   27 ++++++++++++-
 4 files changed, 25 insertions(+), 54 deletions(-)

diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/base/BaseApplication.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/base/BaseApplication.java
index 33bf6ac..1bfb620 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/base/BaseApplication.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/base/BaseApplication.java
@@ -4,7 +4,6 @@
 
 import cn.com.basic.face.service.DictionaryMng;
 import cn.com.basic.face.service.DeviceMng;
-import cn.com.basic.face.service.VisitorTypeMng;
 
 import com.facebook.drawee.backends.pipeline.Fresco;
 import com.lzy.okhttputils.OkHttpUtils;
@@ -49,7 +48,6 @@
         application = this;
         DeviceMng.getInstance().findPlace();
         DictionaryMng.getInstance().loadAllDictionaryData();
-        VisitorTypeMng.getInstance().loadAll();
     }
 
     private void initOkHttpUtils() {
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/BaseMng.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/BaseMng.java
deleted file mode 100644
index e75cccb..0000000
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/BaseMng.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package cn.com.basic.face.service;
-
-import java.util.HashMap;
-import java.util.Map;
-
-public class BaseMng {
-
-    public Map<String, String> idMap = new HashMap<String, String>();
-
-    public String getId(String name) {
-        return idMap.get(name);
-    }
-/*
-    public <T> List<T> getSyncList(String url, Map<String, String> condition, Class<T> requiredType){
-        RequestParams params = new RequestParams(AppApi.BASEURL+url);
-        addParameters(params, condition);
-        try {
-            ResultBean resultBean = x.http().getSync(params, ResultBean.class);
-            return resultBean.getListBeanOfType(requiredType);
-        } catch (Throwable throwable) {
-            throwable.printStackTrace();
-        }
-        return null;
-    }
-
-    private void addParameters(RequestParams params, Map<String, String> condition) {
-        try {
-            for (Map.Entry<String, String> entry : condition.entrySet()) {
-                params.addParameter(entry.getKey(), entry.getValue());
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }*/
-
-}
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 dd6b4bc..665c466 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,8 +2,7 @@
 
 import cn.com.basic.face.dialog.CountryDialog;
 import cn.com.basic.face.dialog.SelectDialog;
-import cn.com.basic.face.fragment.RegisterFragment;
-import cn.com.basic.face.fragment.CheckInFragment;
+import cn.com.basic.face.discern.query.item.VistorTypeQueryItem;
 import cn.com.basic.face.util.AppApi;
 
 import org.xutils.http.RequestParams;
@@ -12,17 +11,24 @@
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import cn.com.basic.face.discern.common.BaseCommonCallBack;
 import cn.com.basic.face.discern.common.CommonVariables;
 import cn.com.basic.face.discern.entity.Dictionary;
 
-public class DictionaryMng extends BaseMng {
+public class DictionaryMng {
 
     public static DictionaryMng instance = new DictionaryMng();
 
     public static DictionaryMng getInstance() {
         return instance;
+    }
+
+    public Map<String, String> idMap = new HashMap<String, String>();
+
+    public String getId(String name) {
+        return idMap.get(name);
     }
 
     public static List<String> nationList = new ArrayList<String>();
@@ -38,6 +44,7 @@
         loadIdTypeList();
         loadGenderList();
         loadVisitReasonList();
+        loadVisitorTypeList();
     }
 
     public void loadCountries() {
@@ -107,4 +114,18 @@
         return nameList;
     }
 
+    private void loadVisitorTypeList() {
+        RequestParams params = new RequestParams(AppApi.BASEURL+AppApi.VISITOR_TYPE_LIST);
+        x.http().get(params, new BaseCommonCallBack() {
+            public void success() {
+                List<String> mVisitorTypeList = new ArrayList<String>();
+                for (VistorTypeQueryItem item : getList(VistorTypeQueryItem.class)) {
+                    mVisitorTypeList.add(item.getLabel());
+                    idMap.put(item.getLabel(), item.getId()+"");
+                }
+                SelectDialog.setVisitorTypeList(mVisitorTypeList);
+            }
+        });
+    }
+
 }
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/IntervieweeQueryMng.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/IntervieweeQueryMng.java
deleted file mode 100644
index 1eac958..0000000
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/IntervieweeQueryMng.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package cn.com.basic.face.service;
-
-import cn.com.basic.face.fragment.CheckInFragment;
-import cn.com.basic.face.util.AppApi;
-
-import org.xutils.http.RequestParams;
-import org.xutils.x;
-
-import cn.com.basic.face.discern.common.BaseCommonCallBack;
-import cn.com.basic.face.discern.query.condition.IntervieweeQueryCondition;
-import cn.com.basic.face.discern.query.item.IntervieweeQueryItem;
-
-/**
- * Created by xiuxi on 2017/3/27.
- */
-
-public class IntervieweeQueryMng {
-
-    public static IntervieweeQueryMng instance = new IntervieweeQueryMng();
-
-    public static IntervieweeQueryMng getInstance() {
-        return instance;
-    }
-
-    public void queryInterviewee(String name, String orderBy, final boolean isClear) {
-        RequestParams params = new RequestParams(AppApi.BASEURL+AppApi.DICTIONARY_TYPE_LIST);
-        params.addBodyParameter(IntervieweeQueryCondition.FieldNames.companyId, "1");
-        params.addBodyParameter(IntervieweeQueryCondition.FieldNames.name, name);
-        x.http().post(params, new BaseCommonCallBack() {
-            public void success() {
-                //CheckInFragment.getInstance().listChanged(getList(IntervieweeQueryItem.class), isClear);
-            }
-        });
-
-    }
-
-}
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 113dbde..85e79b9 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
@@ -13,7 +13,7 @@
 
 import cn.com.basic.face.discern.common.BaseCommonCallBack;
 
-public class RegisterMng extends BaseMng {
+public class RegisterMng {
 
     public static RegisterMng instance = new RegisterMng();
 
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/VisitorTypeMng.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/VisitorTypeMng.java
deleted file mode 100644
index f65f3f8..0000000
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/VisitorTypeMng.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package cn.com.basic.face.service;
-
-import cn.com.basic.face.dialog.SelectDialog;
-import cn.com.basic.face.fragment.RegisterFragment;
-import cn.com.basic.face.util.AppApi;
-import cn.com.basic.face.util.MultipartUtility;
-
-import org.xutils.http.RequestParams;
-import org.xutils.x;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
-
-import cn.com.basic.face.discern.common.BaseCommonCallBack;
-import cn.com.basic.face.discern.query.item.VistorTypeQueryItem;
-
-/**
- * Created by xiuxi on 2017/3/22.
- */
-
-public class VisitorTypeMng extends BaseMng {
-
-    public static VisitorTypeMng instance = new VisitorTypeMng();
-
-    public static VisitorTypeMng getInstance() {
-        return instance;
-    }
-
-    public void loadAll() {
-        loadVisitorTypeList();
-    }
-
-    private void loadVisitorTypeList() {
-        RequestParams params = new RequestParams(AppApi.BASEURL+AppApi.VISITOR_TYPE_LIST);
-        x.http().get(params, new BaseCommonCallBack() {
-            public void success() {
-                List<String> mVisitorTypeList = new ArrayList<String>();
-                for (VistorTypeQueryItem item : getList(VistorTypeQueryItem.class)) {
-                    mVisitorTypeList.add(item.getLabel());
-                    idMap.put(item.getLabel(), item.getId()+"");
-                }
-                SelectDialog.setVisitorTypeList(mVisitorTypeList);
-            }
-        });
-    }
-
-}

--
Gitblit v1.8.0