xuxiuxi
2017-03-20 6db786eadb2c242e0b08e56d47edd08f58e12102


git-svn-id: http://192.168.1.226/svn/proxy@162 454eff88-639b-444f-9e54-f578c98de674
1个文件已添加
7个文件已修改
277 ■■■■ 已修改文件
VisitFace/DemoForBsk/app/src/main/assets/countrys.xml 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/common/CommonVariables.java 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Dictionary.java 166 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/adapter/MyWheelAdapter.java 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/ui/fragment/RegisterFragment.java 59 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/util/AppApi.java 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/widget/BirthdayPickerDialog.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/widget/SingleSelectionPopup.java 17 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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>
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";
    }
}
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Dictionary.java
New file
@@ -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    ;
    }
}
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;
    }
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();
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";
}
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();
                        }
                    }
                });
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>();