From 6db786eadb2c242e0b08e56d47edd08f58e12102 Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期一, 20 三月 2017 18:30:35 +0800
Subject: [PATCH] 

---
 VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/widget/BirthdayPickerDialog.java  |    1 
 VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/ui/fragment/RegisterFragment.java |   59 +++++++----
 VisitFace/DemoForBsk/app/src/main/assets/countrys.xml                                               |   10 +-
 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/common/CommonVariables.java        |    7 +
 VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/widget/SingleSelectionPopup.java  |   17 ++
 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Dictionary.java             |  166 +++++++++++++++++++++++++++++++++
 VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/util/AppApi.java                  |    7 +
 VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/adapter/MyWheelAdapter.java       |   10 +
 8 files changed, 242 insertions(+), 35 deletions(-)

diff --git a/VisitFace/DemoForBsk/app/src/main/assets/countrys.xml b/VisitFace/DemoForBsk/app/src/main/assets/countrys.xml
index 3b53103..6c6765e 100644
--- a/VisitFace/DemoForBsk/app/src/main/assets/countrys.xml
+++ b/VisitFace/DemoForBsk/app/src/main/assets/countrys.xml
@@ -1,13 +1,13 @@
 <root>
     <word name="A">
-        <country name="闃块噷宸村反"/>
+        <country name="闃块噷宸村反" />
     </word>
     <word name="B">
-        <country name="宸磋タ"/>
-        <country name="宸村熀鏂潶"/>
+        <country name="宸磋タ" />
+        <country name="宸村熀鏂潶" />
     </word>
     <word name="Z">
-        <country name="涓浗"/>
-        <country name="鏅哄埄"/>
+        <country name="涓浗" />
+        <country name="鏅哄埄" />
     </word>
 </root>
\ No newline at end of file
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/common/CommonVariables.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/common/CommonVariables.java
index 5fca1d6..5d6548b 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/common/CommonVariables.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/common/CommonVariables.java
@@ -39,5 +39,10 @@
 		private static final int ENTER = 1; //杩�
 		private static final int EXIT = 2; //鍑�
 	}
-	
+
+	public class DictionaryType {
+		public static final String SEX = "sex";
+	}
+
+
 }
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Dictionary.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Dictionary.java
new file mode 100644
index 0000000..3513b49
--- /dev/null
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Dictionary.java
@@ -0,0 +1,166 @@
+package cn.com.basic.face.discern.entity;
+
+import java.io.Serializable;
+
+import cn.com.basic.face.discern.common.BaseEntity;
+
+/**
+ * 鏁版嵁瀛楀吀
+ */
+public class Dictionary extends BaseEntity implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	public static final String MODEL_NAME = "Dictionary";
+
+	public static final class FieldNames {
+		/**
+		 * 涓婚敭
+		 */
+		public static final String id = "id";
+		/**
+		 * 缂栫爜
+		 */
+		public static final String sn = "sn";
+		/**
+		 * 鍚嶇О
+		 */
+		public static final String name = "name";
+		/**
+		 * 绫诲瀷
+		 */
+		public static final String type = "type";
+		/**
+		 * 鎺掑簭
+		 */
+		public static final String orderBy = "orderBy";
+		/**
+		 * 鐖剁骇id
+		 */
+		public static final String pid = "pid";
+		/**
+		 * 澶囨敞
+		 */
+		public static final String remark = "remark";
+	}
+
+	// 涓婚敭
+	private Integer id;
+	// 缂栫爜
+	private String sn;
+	// 鍚嶇О
+	private String name;
+	// 绫诲瀷
+	private String type;
+	// 鎺掑簭
+	private Integer orderBy;
+	// 鐖剁骇id
+	private Integer pid;
+	// 澶囨敞
+	private String remark;
+
+	/**
+	 * Get 涓婚敭
+	 */
+	public Integer getId() {
+		return id;
+	}
+
+	/**
+	 * Set 涓婚敭
+	 */
+	public void setId(Integer id) {
+		this.id = id;
+	}
+
+	/**
+	 * Get 缂栫爜
+	 */
+	public String getSn() {
+		return sn;
+	}
+
+	/**
+	 * Set 缂栫爜
+	 */
+	public void setSn(String sn) {
+		this.sn = sn;
+	}
+
+	/**
+	 * Get 鍚嶇О
+	 */
+	public String getName() {
+		return name;
+	}
+
+	/**
+	 * Set 鍚嶇О
+	 */
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	/**
+	 * Get 绫诲瀷
+	 */
+	public String getType() {
+		return type;
+	}
+
+	/**
+	 * Set 绫诲瀷
+	 */
+	public void setType(String type) {
+		this.type = type;
+	}
+
+	/**
+	 * Get 鎺掑簭
+	 */
+	public Integer getOrderBy() {
+		return orderBy;
+	}
+
+	/**
+	 * Set 鎺掑簭
+	 */
+	public void setOrderBy(Integer orderBy) {
+		this.orderBy = orderBy;
+	}
+
+	/**
+	 * Get 鐖剁骇id
+	 */
+	public Integer getPid() {
+		return pid;
+	}
+
+	/**
+	 * Set 鐖剁骇id
+	 */
+	public void setPid(Integer pid) {
+		this.pid = pid;
+	}
+
+	/**
+	 * Get 澶囨敞
+	 */
+	public String getRemark() {
+		return remark;
+	}
+
+	/**
+	 * Set 澶囨敞
+	 */
+	public void setRemark(String remark) {
+		this.remark = remark;
+	}
+
+	public String toString() {
+		return 
+			 ",涓婚敭 ="   + id         +  ",缂栫爜 ="   + sn         +  ",鍚嶇О ="   + name       + 
+			 ",绫诲瀷 ="   + type       +  ",鎺掑簭 ="   + orderBy    +  ",鐖剁骇id =" + pid        + 
+			 ",澶囨敞 ="   + remark    ;
+	}
+}
diff --git a/VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/adapter/MyWheelAdapter.java b/VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/adapter/MyWheelAdapter.java
index ae98056..69cc7b4 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/adapter/MyWheelAdapter.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/adapter/MyWheelAdapter.java
@@ -9,6 +9,8 @@
 import com.bsk.zhangbo.demoforbsk.R;
 import com.wx.wheelview.adapter.BaseWheelAdapter;
 
+import cn.com.basic.face.discern.entity.Dictionary;
+
 
 /**
  * Created by Administrator on 2016/11/3.
@@ -31,7 +33,13 @@
         } else {
             viewHolder = (ViewHolder) convertView.getTag();
         }
-        viewHolder.textView.setText(mList.get(position));
+        Object o = mList.get(position);
+        if (o instanceof Dictionary) {
+            viewHolder.textView.setText(((Dictionary) o).getName());
+        } else {
+            viewHolder.textView.setText(o+"");
+        }
+
         return convertView;
     }
 
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 022bc6c..31cf09b 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
@@ -12,6 +12,7 @@
 import com.bsk.zhangbo.demoforbsk.R;
 import com.bsk.zhangbo.demoforbsk.base.BaseFragment;
 import com.bsk.zhangbo.demoforbsk.listeners.OkButtonClickedListener;
+import com.bsk.zhangbo.demoforbsk.util.AppApi;
 import com.bsk.zhangbo.demoforbsk.widget.BirthdayPickerDialog;
 import com.bsk.zhangbo.demoforbsk.widget.CountrySelectionPopup;
 import com.bsk.zhangbo.demoforbsk.widget.SingleSelectionPopup;
@@ -25,6 +26,8 @@
 import java.util.List;
 
 import cn.com.basic.face.discern.common.BaseCommonCallBack;
+import cn.com.basic.face.discern.common.CommonVariables;
+import cn.com.basic.face.discern.entity.Dictionary;
 import cn.com.basic.face.discern.query.item.VistorTypeQueryItem;
 
 /**
@@ -36,9 +39,9 @@
     private View mViewName,mViewSex,mViewNation,mViewBirthday,mViewVisitorClass,mViewPhone,mViewIdClass,mViewIdNumber,mViewCompayName,mViewRemark;
     private TextView mViewNameTitle,mViewSexTitle,mViewNationTitle,mViewBirthdyTitle,mViewIdClassContent,mViewSexContent,mViewNationContent,mViewBirthdyContent,mViewVisitorClassContent,mViewVisitorClassTitle,mViewPhoneTitle,mViewIdClassTitle,mViewIdNumberTitle,mViewCompanyNameTitle,mViewRemarkTitle;
     private EditText mViewNameContent,mViewPhoneContent,mViewIdNumberContent,mViewCompanyNameContent,mViewRemarkContent;
-    private List<String> mSexList;
-    private List<String> mVisitorTypeList;
-    private List<String> mCredentialsList;
+    private List mSexList;
+    private List mVisitorTypeList;
+    private List mCredentialsList;
     private LinearLayout mBaseLayout;
     private int mNowYear;
     private int mNowMonth;
@@ -122,7 +125,36 @@
 
     @Override
     protected void initData() {
-        RequestParams params = new RequestParams("http://192.168.1.51:8080/ssm/VisitorType/v_list.do");
+        loadVisitorTypeList();
+
+        loadSexList();
+
+        loadCredentialsList();
+
+    }
+
+    private void loadCredentialsList() {
+        mCredentialsList = new ArrayList<>();
+        mCredentialsList.add("鍚嶇墖");
+        mCredentialsList.add("韬唤璇�");
+
+        mViewIdClassContent.setText(""+mCredentialsList.get(0));
+    }
+
+    private void loadSexList() {
+        RequestParams params = new RequestParams(AppApi.BASEURL+AppApi.DICTIONARY_TYPE_LIST);
+        params.addParameter(Dictionary.FieldNames.type, CommonVariables.DictionaryType.SEX);
+        x.http().get(params, new BaseCommonCallBack() {
+            public void success() {
+                mSexList = getList(Dictionary.class);
+                mViewVisitorClassContent.setText(((Dictionary)mSexList.get(0)).getName()+"");
+            }
+        });
+
+    }
+
+    private void loadVisitorTypeList() {
+        RequestParams params = new RequestParams(AppApi.BASEURL+AppApi.VISITOR_TYPE_LIST);
         x.http().get(params, new BaseCommonCallBack() {
             public void success() {
                 List<VistorTypeQueryItem> items = getList(VistorTypeQueryItem.class);
@@ -134,17 +166,6 @@
             }
 
         });
-
-        mSexList = new ArrayList<>();
-        mSexList.add("鐢�");
-        mSexList.add("濂�");
-        mViewSexContent.setText(mSexList.get(0));
-
-        mCredentialsList = new ArrayList<>();
-        mCredentialsList.add("鍚嶇墖");
-        mCredentialsList.add("韬唤璇�");
-
-        mViewIdClassContent.setText(mCredentialsList.get(0));
     }
 
     @Override
@@ -161,7 +182,6 @@
                 });
                 break;
             case R.id.register_nation:
-//                Toast.makeText(getActivity(),"涓浗",Toast.LENGTH_SHORT).show();
                 CountrySelectionPopup countrySelectionPopup = new CountrySelectionPopup(getActivity());
                 countrySelectionPopup.showAtLocation(mBaseLayout, Gravity.CENTER,0,0);
                 countrySelectionPopup.addOkButtonClickedListener(new OkButtonClickedListener() {
@@ -172,8 +192,6 @@
                 });
                 break;
             case R.id.register_birthday:
-//                Toast.makeText(getActivity(),"1990-1-1",Toast.LENGTH_SHORT).show();
-//                datePickerDialog.show();
                 showDatePicker();
                 break;
             case R.id.register_visitor_class:
@@ -207,10 +225,7 @@
                     @Override
                     public void onDateSet(DatePicker view, int year, int monthOfYear, int dayOfMonth) {
                         int month=monthOfYear+1;
-                        Toast.makeText(
-                                getActivity(),
-                                year + "-" + month + "-" + dayOfMonth,
-                                Toast.LENGTH_SHORT).show();
+                        mViewBirthdyContent.setText(year+"-"+month+"-"+dayOfMonth);
                     }
                 },date);
         myDatePickerDialog.myShow();
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 f45a02f..274bd3a 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
@@ -3,7 +3,10 @@
 public class AppApi {
 	public final static String CHENXINGGROUND_IMAGEURL_BASE = "";
 	public final static String CHENXINGARGEEMRNT = "";// 鍗忚鍓嶇紑
-	public final static String BASEURL = "http://172.16.0.111:8080/chenxingplan/";
+	public final static String BASEURL = "http://192.168.1.51:8080/ssm/";
 
-	public final static String WELCOMEIMAGE = "advImage/";
+	public final static String VISITOR_TYPE_LIST = "VisitorType/v_list.do";
+
+	public final static String DICTIONARY_TYPE_LIST = "Dictionary/v_list.do";
+
 }
diff --git a/VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/widget/BirthdayPickerDialog.java b/VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/widget/BirthdayPickerDialog.java
index fb1483a..386fafe 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/widget/BirthdayPickerDialog.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/widget/BirthdayPickerDialog.java
@@ -92,6 +92,7 @@
                             mDatePicker.clearFocus();
                             mDateSetListener.onDateSet(mDatePicker, mDatePicker.getYear(),
                                     mDatePicker.getMonth(), mDatePicker.getDayOfMonth());
+                            cancel();
                         }
                     }
                 });
diff --git a/VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/widget/SingleSelectionPopup.java b/VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/widget/SingleSelectionPopup.java
index 55340ac..4832db7 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/widget/SingleSelectionPopup.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/widget/SingleSelectionPopup.java
@@ -19,6 +19,8 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import cn.com.basic.face.discern.entity.Dictionary;
+
 /**
  * Created by Sinoe on 2017/2/27.
  */
@@ -26,10 +28,10 @@
 public class SingleSelectionPopup extends PopupWindow implements View.OnClickListener,WheelView.OnWheelItemSelectedListener{
     private View view;
     private TextView mTvConfirm,mTvCancel,mTvTitle;
-    private List<String> mList;
+    private List mList;
     private WheelView mWheelView;
     private Context mContext;
-    public SingleSelectionPopup(Context context, List<String> mList,String mTitle) {
+    public SingleSelectionPopup(Context context, List mList,String mTitle) {
         this.mContext = context;
         view = LayoutInflater.from(context).inflate(R.layout.pop_single_selection,null);
         this.mList = mList;
@@ -108,7 +110,14 @@
                 break;
             case R.id.pop_single_confirm:
                 for (OkButtonClickedListener okButtonClickedListener : okButtonClickedListeners) {
-                    okButtonClickedListener.onItemSelected(0, null, mList.get(mWheelView.getCurrentPosition()));
+                    Object o = mList.get(mWheelView.getCurrentPosition());
+                    String item = "";
+                    if (o instanceof Dictionary) {
+                        item = ((Dictionary) o).getName();
+                    } else {
+                        item = o+"";
+                    }
+                    okButtonClickedListener.onItemSelected(mWheelView.getCurrentPosition(), o, item);
                 }
                 dismiss();
                 break;
@@ -117,7 +126,7 @@
 
     @Override
     public void onItemSelected(int position, Object o) {
-        Toast.makeText(mContext,mList.get(position),Toast.LENGTH_SHORT).show();
+        //Toast.makeText(mContext,mList.get(position),Toast.LENGTH_SHORT).show();
     }
 
     private List<OkButtonClickedListener> okButtonClickedListeners = new ArrayList<OkButtonClickedListener>();

--
Gitblit v1.8.0