xuxiuxi

2017-03-29 96c779d22c0a1df0d3441ebb4fcd30f9311e1fe2

git-svn-id: http://192.168.1.226/svn/proxy@246 454eff88-639b-444f-9e54-f578c98de674

 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/CheckInFragment.java

@@ -25,7 +25,7 @@
import cn.com.basic.face.base.MainActivity;

import cn.com.basic.face.util.AppApi;

import cn.com.basic.face.util.Constant;

import cn.com.basic.face.widget.VisitPurposePopup;

import cn.com.basic.face.widget.VisitPurposeDialog;

import cn.com.basic.face.widget.VisitorView;

import com.camnter.easyrecyclerview.widget.EasyRecyclerView;

import com.lidroid.xutils.ViewUtils;

@@ -49,7 +49,7 @@
 */



public class CheckInFragment extends MainUIBaseFragment {

    private View mViewLeft,mViewRight;

    private View fragment_check_in_left,mViewRight;

    private RadioGroup mRGTop,mRGClass;

    private LinearLayout mLlRadioGroupClass;

    private VisitorView right, left;

@@ -75,11 +75,11 @@
    private EditText visitorRemarkEt;

    @ViewInject(R.id.visitor_reason_tv)

    private TextView visitorReasonTv;

    @ViewInject(R.id.visitor_register_search_et)

    @ViewInject(R.id.fragment_check_in_left_search_edit_text)

    private EditText visitorRegisterSearchEt;

    @ViewInject(R.id.visitor_register_rb_left)

    @ViewInject(R.id.fragment_check_in_left_visitor_radio)

    private RadioButton visitorRegisterRbLeft;

    @ViewInject(R.id.visitor_register_check_department)

    @ViewInject(R.id.fragment_check_in_left_sort_by_dept_radio_button)

    private RadioButton visitorRegisterCheckDepartment;

    private ImageView rightPhoto;



@@ -98,8 +98,7 @@
            @Override

            public void onCheckedChanged(RadioGroup radioGroup, int i) {

                switch (radioGroup.getCheckedRadioButtonId()){

                    case R.id.visitor_register_rb_left:

                        //Toast.makeText(MainActivity.getInstance(), "来访人员", Toast.LENGTH_SHORT).show();

                    case R.id.fragment_check_in_left_visitor_radio:

                        mLlRadioGroupClass.setVisibility(View.GONE);

                        mAdapter = new VisitorRecyclerViewAdapter(getActivity(), Constant.VISITOR_FROM);

                        //mList.clear();

@@ -108,8 +107,7 @@
                        int pageNum = 1;

                        VisitorCheckInMng.getInstance().findVisitorList(pageNum+"", visitorRegisterSearchEt.getText().toString(), true);

                        break;

                    case R.id.visitor_register_rb_right:

                        //Toast.makeText(MainActivity.getInstance(), "被访人员", Toast.LENGTH_SHORT).show();

                    case R.id.fragment_check_in_left_interviewee_radio:

                        mLlRadioGroupClass.setVisibility(View.VISIBLE);

                        mAdapter = new VisitorRecyclerViewAdapter(getActivity(), Constant.VISITOR_TO);

                        mAdapter.setVisitorToColor(VisitorRecyclerViewAdapter.TYPE_NAME);

@@ -126,14 +124,14 @@
            @Override

            public void onCheckedChanged(RadioGroup radioGroup, int i) {

                switch (radioGroup.getCheckedRadioButtonId()){

                    case R.id.visitor_register_check_name:

                    case R.id.fragment_check_in_left_sort_by_name_radio_button:

//                        mAdapter.setVisitorToTextColor(VisitorRecyclerViewAdapter.TYPE_NAME);

                        mAdapter.setVisitorToColor(VisitorRecyclerViewAdapter.TYPE_NAME);

                        sort(mList, false);

                        mAdapter.setList(mList);

                        mRecyclerView.setAdapter(mAdapter);

                        break;

                    case R.id.visitor_register_check_department:

                    case R.id.fragment_check_in_left_sort_by_dept_radio_button:

//                        mAdapter.setVisitorToTextColor(VisitorRecyclerViewAdapter.TYPE_DEPARTMENT);

                        mAdapter.setVisitorToColor(VisitorRecyclerViewAdapter.TYPE_DEPARTMENT);

                        sort(mList, true);

@@ -192,17 +190,17 @@


    @Override

    public View addLeftLayout() {

        mViewLeft = LayoutInflater.from(getActivity()).inflate(R.layout.fragment_check_in_left,null);

        mRGTop = (RadioGroup) mViewLeft.findViewById(R.id.visitor_register_radio);

        mRGClass = (RadioGroup) mViewLeft.findViewById(R.id.visitor_register_check_class);

        mLlRadioGroupClass = (LinearLayout) mViewLeft.findViewById(R.id.visitor_register_check_class_ll);

        mRecyclerView = (EasyRecyclerView) mViewLeft.findViewById(R.id.visitor_register_recycler);

        fragment_check_in_left = LayoutInflater.from(getActivity()).inflate(R.layout.fragment_check_in_left,null);

        mRGTop = (RadioGroup) fragment_check_in_left.findViewById(R.id.fragment_check_in_left_radio_group);

        mRGClass = (RadioGroup) fragment_check_in_left.findViewById(R.id.visitor_register_check_class);

        mLlRadioGroupClass = (LinearLayout) fragment_check_in_left.findViewById(R.id.fragment_check_in_left_sort_type_linear_layout);

        mRecyclerView = (EasyRecyclerView) fragment_check_in_left.findViewById(R.id.fragment_check_in_left_list_view);

        LinearLayoutManager manager = new LinearLayoutManager(getActivity(),LinearLayoutManager.VERTICAL,false);

        mRecyclerView.setLayoutManager(manager);

        mAdapter = new VisitorRecyclerViewAdapter(getActivity(),Constant.VISITOR_FROM);



        ViewUtils.inject(this, mViewLeft);

        return mViewLeft;

        ViewUtils.inject(this, fragment_check_in_left);

        return fragment_check_in_left;

    }



    @Override

@@ -229,7 +227,7 @@
        return mViewRight;

    }



    @OnClick(R.id.visitor_register_back)

    @OnClick(R.id.fragment_check_in_left_back)

    public void back(View view) {

        MainActivity.selectPage(0);

    }

@@ -262,7 +260,7 @@


    @OnClick(R.id.visitor_reason_tv)

    public void visitorReason(View view) {

        VisitPurposePopup popup1 = new VisitPurposePopup(getActivity(),visitPurposeList,"请选择拜访事由");

        VisitPurposeDialog popup1 = new VisitPurposeDialog(getActivity(),visitPurposeList,"请选择拜访事由");

        popup1.showAtLocation(getView(), Gravity.CENTER,0,0);

        popup1.addOkButtonClickedListener(new OkButtonClickedListener() {

            @Override


 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/PhoneCallFragment.java

@@ -43,10 +43,10 @@
    public View addLeftLayout() {



        mViewLeft = LayoutInflater.from(getActivity()).inflate(R.layout.fragment_phone_call_left,null);

        mRGTop = (RadioGroup) mViewLeft.findViewById(R.id.visitor_register_radio);

        mRGTop = (RadioGroup) mViewLeft.findViewById(R.id.fragment_check_in_left_radio_group);

        mRGClass = (RadioGroup) mViewLeft.findViewById(R.id.visitor_register_check_class);

        mLlRadioGroupClass = (LinearLayout) mViewLeft.findViewById(R.id.visitor_register_check_class_ll);

        mRecyclerView = (EasyRecyclerView) mViewLeft.findViewById(R.id.visitor_register_recycler);

        mLlRadioGroupClass = (LinearLayout) mViewLeft.findViewById(R.id.fragment_check_in_left_sort_type_linear_layout);

        mRecyclerView = (EasyRecyclerView) mViewLeft.findViewById(R.id.fragment_check_in_left_list_view);

        LinearLayoutManager manager = new LinearLayoutManager(getActivity(),LinearLayoutManager.VERTICAL,false);

        mRecyclerView.setLayoutManager(manager);

        mAdapter = new VisitorRecyclerViewAdapter(getActivity(),Constant.VISITOR_FROM);

@@ -76,13 +76,13 @@
            @Override

            public void onCheckedChanged(RadioGroup radioGroup, int i) {

                switch (radioGroup.getCheckedRadioButtonId()){

                    case R.id.visitor_register_rb_left:

                    case R.id.fragment_check_in_left_visitor_radio:

                        mLlRadioGroupClass.setVisibility(View.GONE);

                        mAdapter = new VisitorRecyclerViewAdapter(getActivity(), Constant.VISITOR_FROM);

                        mAdapter.setList(mList);

                        mRecyclerView.setAdapter(mAdapter);

                        break;

                    case R.id.visitor_register_rb_right:

                    case R.id.fragment_check_in_left_interviewee_radio:

                        mLlRadioGroupClass.setVisibility(View.VISIBLE);

                        mAdapter = new VisitorRecyclerViewAdapter(getActivity(), Constant.VISITOR_TO);

                        mAdapter.setVisitorToColor(VisitorRecyclerViewAdapter.TYPE_NAME);

@@ -96,13 +96,13 @@
            @Override

            public void onCheckedChanged(RadioGroup radioGroup, int i) {

                switch (radioGroup.getCheckedRadioButtonId()){

                    case R.id.visitor_register_check_name:

                    case R.id.fragment_check_in_left_sort_by_name_radio_button:

//                        mAdapter.setVisitorToTextColor(VisitorRecyclerViewAdapter.TYPE_NAME);

                        mAdapter.setVisitorToColor(VisitorRecyclerViewAdapter.TYPE_NAME);

                        mAdapter.setList(mList);

                        mRecyclerView.setAdapter(mAdapter);

                        break;

                    case R.id.visitor_register_check_department:

                    case R.id.fragment_check_in_left_sort_by_dept_radio_button:

//                        mAdapter.setVisitorToTextColor(VisitorRecyclerViewAdapter.TYPE_DEPARTMENT);

                        mAdapter.setVisitorToColor(VisitorRecyclerViewAdapter.TYPE_DEPARTMENT);

                        mAdapter.setList(mList);


 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/RegisterFragment.java

@@ -23,8 +23,8 @@
import cn.com.basic.face.listeners.OkButtonClickedListener;



import cn.com.basic.face.widget.BirthdayPickerDialog;

import cn.com.basic.face.widget.CountrySelectionPopup;

import cn.com.basic.face.widget.SingleSelectionPopup;

import cn.com.basic.face.widget.CountrySelectionDialog;

import cn.com.basic.face.widget.SingleSelectionDialog;

import com.lidroid.xutils.ViewUtils;

import com.lidroid.xutils.view.annotation.ViewInject;

import com.lidroid.xutils.view.annotation.event.OnClick;

@@ -170,7 +170,7 @@


    @OnClick(R.id.register_gender)

    public void selectGender(View view) {

        SingleSelectionPopup popup = new SingleSelectionPopup(getActivity(),mSexList,"性别");

        SingleSelectionDialog popup = new SingleSelectionDialog(getActivity(),mSexList,"性别");

        popup.showAtLocation(mBaseLayout, Gravity.CENTER,0,0);

        popup.addOkButtonClickedListener(new OkButtonClickedListener() {

            @Override

@@ -188,7 +188,7 @@


    @OnClick(R.id.register_country)

    public void selectCountry(View view) {

        CountrySelectionPopup countrySelectionPopup = new CountrySelectionPopup(getActivity(),

        CountrySelectionDialog countrySelectionPopup = new CountrySelectionDialog(getActivity(),

                countryWordData,countryWordList,countryData);

        countrySelectionPopup.showAtLocation(mBaseLayout, Gravity.CENTER,0,0);

        countrySelectionPopup.addOkButtonClickedListener(new OkButtonClickedListener() {

@@ -216,7 +216,7 @@


    @OnClick(R.id.register_visitor_class)

    public void selectVisitorType(View view) {

        SingleSelectionPopup popup1 = new SingleSelectionPopup(getActivity(),mVisitorTypeList,"访客类型");

        SingleSelectionDialog popup1 = new SingleSelectionDialog(getActivity(),mVisitorTypeList,"访客类型");

        popup1.showAtLocation(mBaseLayout, Gravity.CENTER,0,0);

        popup1.addOkButtonClickedListener(new OkButtonClickedListener() {

            @Override

@@ -228,7 +228,7 @@


    @OnClick(R.id.register_id_class)

    public void selectIdentityType(View view) {

        SingleSelectionPopup popup2 = new SingleSelectionPopup(getActivity(),mCredentialsList,"证件类型");

        SingleSelectionDialog popup2 = new SingleSelectionDialog(getActivity(),mCredentialsList,"证件类型");

        popup2.showAtLocation(mBaseLayout, Gravity.CENTER,0,0);

        popup2.addOkButtonClickedListener(new OkButtonClickedListener() {

            @Override


 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/CountrySelectionDialog.java

File was renamed from VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/CountrySelectionPopup.java
@@ -27,7 +27,7 @@
 * Created by Sinoe on 2017/2/28.

 */



public class CountrySelectionPopup extends PopupWindow implements View.OnClickListener, WheelView.OnWheelItemSelectedListener {

public class CountrySelectionDialog extends PopupWindow implements View.OnClickListener, WheelView.OnWheelItemSelectedListener {

    private Context mContext;

    private View view;

    private TextView mTvConfirm, mTvCancel;

@@ -37,7 +37,7 @@
    private List<String> countryList;

    private CountryPresenter countryPresenter;



    public CountrySelectionPopup(Context context, String[] countryWordData, List<String> countryWordList, HashMap<String, List<String>> countryData) {

    public CountrySelectionDialog(Context context, String[] countryWordData, List<String> countryWordList, HashMap<String, List<String>> countryData) {



        this.mContext = context;

        countryPresenter = new CountryPresenter(context);


 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/SingleSelectionDialog.java

File was renamed from VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/SingleSelectionPopup.java
@@ -24,13 +24,13 @@
 * Created by Sinoe on 2017/2/27.

 */



public class SingleSelectionPopup extends PopupWindow implements View.OnClickListener,WheelView.OnWheelItemSelectedListener{

public class SingleSelectionDialog extends PopupWindow implements View.OnClickListener,WheelView.OnWheelItemSelectedListener{

    private View view;

    private TextView mTvConfirm,mTvCancel,mTvTitle;

    private List mList;

    private WheelView mWheelView;

    private Context mContext;

    public SingleSelectionPopup(Context context, List mList,String mTitle) {

    public SingleSelectionDialog(Context context, List mList, String mTitle) {

        this.mContext = context;

        view = LayoutInflater.from(context).inflate(R.layout.dialog_single_selection,null);

        this.mList = mList;


 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/VisitPurposeDialog.java

File was renamed from VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/VisitPurposePopup.java
@@ -24,13 +24,13 @@
 * Created by Sinoe on 2017/2/27.

 */



public class VisitPurposePopup extends PopupWindow implements View.OnClickListener,WheelView.OnWheelItemSelectedListener{

public class VisitPurposeDialog extends PopupWindow implements View.OnClickListener,WheelView.OnWheelItemSelectedListener{

    private View view;

    private TextView mTvConfirm,mTvCancel,mTvTitle;

    private List mList;

    private WheelView mWheelView;

    private Context mContext;

    public VisitPurposePopup(Context context, List mList, String mTitle) {

    public VisitPurposeDialog(Context context, List mList, String mTitle) {

        this.mContext = context;

        view = LayoutInflater.from(context).inflate(R.layout.dialog_visit_reason,null);

        this.mList = mList;


 VisitFace/DemoForBsk/app/src/main/res/layout/fragment_check_in_left.xml

@@ -6,7 +6,7 @@
        android:layout_width="match_parent"

        android:layout_height="wrap_content">

        <TextView

            android:id="@+id/visitor_register_back"

            android:id="@+id/fragment_check_in_left_back"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:text="&lt; 来访登记"

@@ -16,13 +16,13 @@
            android:textColor="#8BD2F6"

            />

        <RadioGroup

            android:id="@+id/visitor_register_radio"

            android:id="@+id/fragment_check_in_left_radio_group"

            android:layout_width="match_parent"

            android:layout_height="51dp"

            android:gravity="center"

            android:orientation="horizontal">

            <RadioButton

                android:id="@+id/visitor_register_rb_left"

                android:id="@+id/fragment_check_in_left_visitor_radio"

                android:button="@null"

                android:text="来访人员"

                android:textColor="@color/tab_visitor_register"

@@ -31,7 +31,7 @@
                android:layout_width="wrap_content"

                android:layout_height="wrap_content" />

            <RadioButton

                android:id="@+id/visitor_register_rb_right"

                android:id="@+id/fragment_check_in_left_interviewee_radio"

                android:button="@null"

                android:text="被访人员"

                android:textColor="@color/tab_visitor_register"

@@ -46,7 +46,7 @@
        android:background="@color/colorSearch"

        android:orientation="vertical">

        <EditText

            android:id="@+id/visitor_register_search_et"

            android:id="@+id/fragment_check_in_left_search_edit_text"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_marginTop="5.5dp"

@@ -65,7 +65,7 @@
                android:background="@android:color/white"

                android:orientation="vertical">

                <LinearLayout

                    android:id="@+id/visitor_register_check_class_ll"

                    android:id="@+id/fragment_check_in_left_sort_type_linear_layout"

                    android:orientation="horizontal"

                    android:gravity="center"

                    android:visibility="gone"

@@ -85,7 +85,7 @@
                        android:gravity="center"

                        android:orientation="horizontal">

                        <RadioButton

                            android:id="@+id/visitor_register_check_name"

                            android:id="@+id/fragment_check_in_left_sort_by_name_radio_button"

                            android:text="按姓名"

                            android:textColor="@color/colorText_b"

                            android:checked="true"

@@ -93,7 +93,7 @@
                            android:layout_width="wrap_content"

                            android:layout_height="wrap_content" />

                        <RadioButton

                            android:id="@+id/visitor_register_check_department"

                            android:id="@+id/fragment_check_in_left_sort_by_dept_radio_button"

                            android:text="按部门"

                            android:textSize="@dimen/text_size_big"

                            android:textColor="@color/colorText_b"

@@ -102,7 +102,7 @@
                    </RadioGroup>

                </LinearLayout>

                <com.camnter.easyrecyclerview.widget.EasyRecyclerView

                    android:id="@+id/visitor_register_recycler"

                    android:id="@+id/fragment_check_in_left_list_view"

                    android:layout_width="match_parent"

                    android:layout_height="match_parent"></com.camnter.easyrecyclerview.widget.EasyRecyclerView>

            </LinearLayout>


 VisitFace/DemoForBsk/app/src/main/res/layout/fragment_phone_call_left.xml

@@ -19,13 +19,13 @@
        android:visibility="gone">



        <RadioGroup

            android:id="@+id/visitor_register_radio"

            android:id="@+id/fragment_check_in_left_radio_group"

            android:layout_width="match_parent"

            android:layout_height="51dp"

            android:gravity="center"

            android:orientation="horizontal">

            <RadioButton

                android:id="@+id/visitor_register_rb_left"

                android:id="@+id/fragment_check_in_left_visitor_radio"

                android:button="@null"

                android:text="来访人员"

                android:textColor="@color/tab_visitor_register"

@@ -33,7 +33,7 @@
                android:layout_width="wrap_content"

                android:layout_height="wrap_content" />

            <RadioButton

                android:id="@+id/visitor_register_rb_right"

                android:id="@+id/fragment_check_in_left_interviewee_radio"

                android:button="@null"

                android:text="被访人员"

                android:checked="true"

@@ -49,7 +49,7 @@
        android:background="@color/colorSearch"

        android:orientation="vertical">

        <EditText

            android:id="@+id/visitor_register_search_et"

            android:id="@+id/fragment_check_in_left_search_edit_text"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_marginTop="5.5dp"

@@ -66,7 +66,7 @@
            android:background="@android:color/white"

            android:orientation="vertical">

            <LinearLayout

                android:id="@+id/visitor_register_check_class_ll"

                android:id="@+id/fragment_check_in_left_sort_type_linear_layout"

                android:orientation="horizontal"

                android:gravity="center"

                android:visibility="gone"

@@ -86,7 +86,7 @@
                    android:gravity="center"

                    android:orientation="horizontal">

                    <RadioButton

                        android:id="@+id/visitor_register_check_name"

                        android:id="@+id/fragment_check_in_left_sort_by_name_radio_button"

                        android:text="按姓名"

                        android:textColor="@color/colorText_b"

                        android:checked="true"

@@ -94,7 +94,7 @@
                        android:layout_width="wrap_content"

                        android:layout_height="wrap_content" />

                    <RadioButton

                        android:id="@+id/visitor_register_check_department"

                        android:id="@+id/fragment_check_in_left_sort_by_dept_radio_button"

                        android:text="按部门"

                        android:textSize="@dimen/text_size_big"

                        android:textColor="@color/colorText_b"

@@ -103,7 +103,7 @@
                </RadioGroup>

            </LinearLayout>

            <com.camnter.easyrecyclerview.widget.EasyRecyclerView

                android:id="@+id/visitor_register_recycler"

                android:id="@+id/fragment_check_in_left_list_view"

                android:layout_width="match_parent"

                android:layout_height="match_parent"></com.camnter.easyrecyclerview.widget.EasyRecyclerView>

        </LinearLayout>