From 96296506cc2853b979844f1a1e46360b619bfdfb Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期二, 28 三月 2017 10:36:58 +0800
Subject: [PATCH] 

---
 VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/service/PlaceMng.java             |   40 +++++++++++++
 VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/ui/fragment/RegisterFragment.java |   38 ++++++++++--
 VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/service/PersonMng.java            |    6 -
 VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/widget/CountrySelectionPopup.java |    8 +-
 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/common/BaseCommonCallBack.java     |    5 -
 VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/base/BaseApplication.java         |   18 +++++
 VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/ui/activity/MainActivity.java     |    2 
 VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/service/VisitorTypeMng.java       |    2 
 VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/util/AppApi.java                  |    2 
 VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/service/DictionaryMng.java        |    4 +
 10 files changed, 104 insertions(+), 21 deletions(-)

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 8355142..04d53e7 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
@@ -11,9 +11,6 @@
 
 import java.util.List;
 
-
-import cn.com.basic.face.discern.query.item.VistorTypeQueryItem;
-
 /**
  * Created by xiuxi on 2017/3/20.
  */
@@ -59,7 +56,7 @@
 
     @Override
     public void onError(Throwable ex, boolean isOnCallback) {
-        Toast.makeText(BaseApplication.getApplication(), "缃戠粶杩炴帴澶辫触", Toast.LENGTH_SHORT ).show();
+        Toast.makeText(BaseApplication.getInstance(), "缃戠粶杩炴帴澶辫触", Toast.LENGTH_SHORT ).show();
     }
 
     @Override
diff --git a/VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/base/BaseApplication.java b/VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/base/BaseApplication.java
index 1fe649b..6c7758b 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/base/BaseApplication.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/base/BaseApplication.java
@@ -3,6 +3,7 @@
 import android.app.Application;
 
 import com.bsk.zhangbo.demoforbsk.service.DictionaryMng;
+import com.bsk.zhangbo.demoforbsk.service.PlaceMng;
 import com.bsk.zhangbo.demoforbsk.service.VisitorTypeMng;
 import com.facebook.drawee.backends.pipeline.Fresco;
 import com.lzy.okhttputils.OkHttpUtils;
@@ -10,6 +11,8 @@
 import com.lzy.okhttputils.model.HttpParams;
 
 import org.xutils.x;
+
+import cn.com.basic.face.discern.entity.Place;
 
 /**
  * Created by zhangbo on 2017/2/15.
@@ -19,8 +22,18 @@
 
     private static BaseApplication application;
 
-    public static BaseApplication getApplication() {
+    public static BaseApplication getInstance() {
         return application;
+    }
+
+    private Place place;
+
+    public void setPlace(Place place) {
+        this.place = place;
+    }
+
+    public Place getPlace() {
+        return place;
     }
 
     @Override
@@ -30,10 +43,10 @@
         Fresco.initialize(this);
         initOkHttpUtils();
         application = this;
+        PlaceMng.getInstance().findPlace();
         DictionaryMng.getInstance().loadAllDictionaryData();
         VisitorTypeMng.getInstance().loadAll();
     }
-
 
     private void initOkHttpUtils() {
         HttpHeaders headers = new HttpHeaders();
@@ -45,4 +58,5 @@
         //蹇呴』璋冪敤鍒濆鍖�
         OkHttpUtils.init(this);
     }
+
 }
diff --git a/VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/service/DictionaryMng.java b/VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/service/DictionaryMng.java
index 8169fd3..f7c4389 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/service/DictionaryMng.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/service/DictionaryMng.java
@@ -1,5 +1,6 @@
 package com.bsk.zhangbo.demoforbsk.service;
 
+import com.bsk.zhangbo.demoforbsk.ui.fragment.RegisterFragment;
 import com.bsk.zhangbo.demoforbsk.util.AppApi;
 
 import org.xutils.http.RequestParams;
@@ -56,6 +57,7 @@
                     countryWordData[i] = item.getName();
                     i++;
                 }
+                RegisterFragment.getInstance().setCountryData(countryWordData, countryWordList, countryData);
             }
         });
 
@@ -71,6 +73,7 @@
                     idMap.put(item.getName(), item.getId()+"");
                     mCredentialsList.add(item.getName());
                 }
+                RegisterFragment.getInstance().setCredentialsList(mCredentialsList);
             }
         });
     }
@@ -85,6 +88,7 @@
                     idMap.put(item.getName(), item.getId()+"");
                     mSexList.add(item.getName());
                 }
+                RegisterFragment.getInstance().setSexList(mSexList);
             }
         });
 
diff --git a/VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/service/PersonMng.java b/VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/service/PersonMng.java
index 7ec123a..690026c 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/service/PersonMng.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/service/PersonMng.java
@@ -12,8 +12,6 @@
 import java.io.FileWriter;
 
 import cn.com.basic.face.discern.common.BaseCommonCallBack;
-import cn.com.basic.face.discern.entity.Person;
-import cn.com.basic.face.discern.entity.VisitPersonType;
 
 /**
  * Created by xiuxi on 2017/3/23.
@@ -30,7 +28,7 @@
     public void add(RequestParams params) {
 
         try {
-            File path = BaseApplication.getApplication().getFilesDir();
+            File path = BaseApplication.getInstance().getFilesDir();
             File f1 = new File(path, "1.txt");
             if (!f1.exists()) {
                 f1.createNewFile();
@@ -51,7 +49,7 @@
             x.http().post(params, new BaseCommonCallBack() {
                 @Override
                 public void success() {
-                    Toast.makeText(BaseApplication.getApplication(),"娣诲姞鎴愬姛", Toast.LENGTH_SHORT).show();
+                    Toast.makeText(BaseApplication.getInstance(),"娣诲姞鎴愬姛", Toast.LENGTH_SHORT).show();
                 }
             });
         }catch(Exception e) {
diff --git a/VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/service/PlaceMng.java b/VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/service/PlaceMng.java
new file mode 100644
index 0000000..b07b515
--- /dev/null
+++ b/VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/service/PlaceMng.java
@@ -0,0 +1,40 @@
+package com.bsk.zhangbo.demoforbsk.service;
+
+import android.widget.Toast;
+
+import com.bsk.zhangbo.demoforbsk.base.BaseApplication;
+import com.bsk.zhangbo.demoforbsk.util.AppApi;
+
+import org.xutils.http.RequestParams;
+import org.xutils.x;
+
+import cn.com.basic.face.discern.common.ResultBean;
+import cn.com.basic.face.discern.entity.Place;
+
+/**
+ * Created by xiuxi on 2017/3/28.
+ */
+
+public class PlaceMng {
+    public static PlaceMng instance = new PlaceMng();
+
+    public static final String authorationId = "101";
+
+    public static PlaceMng getInstance() {
+        return instance;
+    }
+
+    public void findPlace() {
+        try {
+            RequestParams params = new RequestParams(AppApi.BASEURL + AppApi.PLACE_READ);
+            params.addBodyParameter(Place.FieldNames.authorizationId, authorationId);
+            ResultBean resultBean = x.http().postSync(params, ResultBean.class);
+            Place place = resultBean.getBeanOfType(Place.class);
+            BaseApplication.getInstance().setPlace(place);
+        } catch (Throwable e) {
+            e.printStackTrace();
+            Toast.makeText(BaseApplication.getInstance(), "鏁版嵁搴撲腑鎵句笉鍒拌璁惧", Toast.LENGTH_SHORT).show();
+        }
+    }
+
+}
diff --git a/VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/service/VisitorTypeMng.java b/VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/service/VisitorTypeMng.java
index 3e1942c..2792514 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/service/VisitorTypeMng.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/service/VisitorTypeMng.java
@@ -3,6 +3,7 @@
 import android.widget.Toast;
 
 import com.bsk.zhangbo.demoforbsk.base.BaseApplication;
+import com.bsk.zhangbo.demoforbsk.ui.fragment.RegisterFragment;
 import com.bsk.zhangbo.demoforbsk.util.AppApi;
 import com.bsk.zhangbo.demoforbsk.util.MultipartUtility;
 
@@ -50,6 +51,7 @@
                     mVisitorTypeList.add(item.getLabel());
                     idMap.put(item.getLabel(), item.getId()+"");
                 }
+                RegisterFragment.getInstance().setVisitorTypeList(mVisitorTypeList);
             }
 
         });
diff --git a/VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/ui/activity/MainActivity.java b/VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/ui/activity/MainActivity.java
index 71f3e1b..0bf73c0 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/ui/activity/MainActivity.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/ui/activity/MainActivity.java
@@ -46,7 +46,7 @@
         int[] tabIcons = TabNameUtil.tabIcons;
         MyFragmentPagerAdapter myFragmentPagerAdapter = new MyFragmentPagerAdapter(getSupportFragmentManager(),MainActivity.this);
         myFragmentPagerAdapter.addFragment(OneFragment.getInstance(), tabNamesList.get(0),tabIcons[0]);
-        myFragmentPagerAdapter.addFragment(RegisterFragment.newInstance(), tabNamesList.get(1),tabIcons[1]);
+        myFragmentPagerAdapter.addFragment(RegisterFragment.getInstance(), tabNamesList.get(1),tabIcons[1]);
         myFragmentPagerAdapter.addFragment(VisitorRegisterFragment.getInstance(), tabNamesList.get(2),tabIcons[2]);
         myFragmentPagerAdapter.addFragment(TelPhoneFragment.newInstance(), tabNamesList.get(3),tabIcons[3]);
         myFragmentPagerAdapter.addFragment(VisitorManagerFragment.newInstance(), tabNamesList.get(4),tabIcons[4]);
diff --git a/VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/ui/fragment/RegisterFragment.java b/VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/ui/fragment/RegisterFragment.java
index 64a079f..78a8870 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/ui/fragment/RegisterFragment.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/ui/fragment/RegisterFragment.java
@@ -34,6 +34,7 @@
 import java.io.IOException;
 import java.util.Calendar;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
 
 import cn.com.basic.face.discern.entity.Person;
@@ -81,8 +82,14 @@
     @ViewInject(R.id.register_remark)
     private View mViewRemark;
 
-    public static RegisterFragment newInstance() {
-        return new RegisterFragment();
+    private String[] countryWordData;
+    private List<String> countryWordList;
+    private HashMap<String, List<String>> countryData;
+
+    private static RegisterFragment instance = new RegisterFragment();
+
+    public static RegisterFragment getInstance() {
+        return instance;
     }
     @Override
     protected int getLayoutId() {
@@ -144,9 +151,21 @@
 
     @Override
     protected void initData() {
-        mVisitorTypeList = VisitorTypeMng.mVisitorTypeList;
-        mSexList = DictionaryMng.mSexList;
-        mCredentialsList = DictionaryMng.mCredentialsList;
+//        mVisitorTypeList = VisitorTypeMng.mVisitorTypeList;
+//        mSexList = DictionaryMng.mSexList;
+//        mCredentialsList = DictionaryMng.mCredentialsList;
+    }
+
+    public void setVisitorTypeList(List visitorTypeList) {
+        this.mVisitorTypeList = visitorTypeList;
+    }
+
+    public void setSexList(List sexList) {
+        this.mSexList = sexList;
+    }
+
+    public void setCredentialsList(List credentialsList) {
+        this.mCredentialsList = credentialsList;
     }
 
     @OnClick(R.id.register_gender)
@@ -161,9 +180,16 @@
         });
     }
 
+    public void setCountryData(String[] countryWordData, List<String> countryWordList, HashMap<String, List<String>> countryData) {
+        this.countryData = countryData;
+        this.countryWordList = countryWordList;
+        this.countryData = countryData;
+    }
+
     @OnClick(R.id.register_country)
     public void selectCountry(View view) {
-        CountrySelectionPopup countrySelectionPopup = new CountrySelectionPopup(getActivity());
+        CountrySelectionPopup countrySelectionPopup = new CountrySelectionPopup(getActivity(),
+                countryWordData,countryWordList,countryData);
         countrySelectionPopup.showAtLocation(mBaseLayout, Gravity.CENTER,0,0);
         countrySelectionPopup.addOkButtonClickedListener(new OkButtonClickedListener() {
             @Override
diff --git a/VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/util/AppApi.java b/VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/util/AppApi.java
index a4a125f..4a122f0 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/util/AppApi.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/util/AppApi.java
@@ -13,4 +13,6 @@
 
 	public static final String QUERY_INTERVIEWEE = "queryInterviewee/v_read.do";//琚浜哄垪琛�
 
+	public final static String PLACE_READ = "Place/v_read.do";
+
 }
diff --git a/VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/widget/CountrySelectionPopup.java b/VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/widget/CountrySelectionPopup.java
index 08bed90..2509ded 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/widget/CountrySelectionPopup.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/widget/CountrySelectionPopup.java
@@ -37,7 +37,7 @@
     private List<String> countryList;
     private CountryPresenter countryPresenter;
 
-    public CountrySelectionPopup(Context context) {
+    public CountrySelectionPopup(Context context, String[] countryWordData, List<String> countryWordList, HashMap<String, List<String>> countryData) {
 
         this.mContext = context;
         countryPresenter = new CountryPresenter(context);
@@ -51,9 +51,9 @@
         mTvCancel.setOnClickListener(this);
         mTvConfirm.setOnClickListener(this);
 
-        String[] countryWordData = DictionaryMng.countryWordData;
-        countryWordList = DictionaryMng.countryWordList;
-        countryData = DictionaryMng.countryData;
+        //String[] countryWordData = DictionaryMng.countryWordData;
+        this.countryWordList = countryWordList;//DictionaryMng.countryWordList;
+        this.countryData = countryData;//DictionaryMng.countryData;
 
         countryList = countryData.get(countryWordList.get(mWheelViewTitle.getSelection()));
 

--
Gitblit v1.8.0