xuxiuxi
2017-03-29 d17be73f53c21c5ceae03fe8494c195f0bbf4abf


git-svn-id: http://192.168.1.226/svn/proxy@231 454eff88-639b-444f-9e54-f578c98de674
7个文件已修改
186 ■■■■■ 已修改文件
VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/adapter/OneBottomRecylerViewAdapter.java 22 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/service/VisitorCheckInMng.java 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/ui/fragment/OneFragment.java 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/ui/fragment/VisitorRegisterFragment.java 111 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/res/layout/item_visitor_user.xml 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/res/layout/view_visitor.xml 18 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/res/layout/visitor_register_right.xml 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/adapter/OneBottomRecylerViewAdapter.java
@@ -1,6 +1,7 @@
package com.bsk.zhangbo.demoforbsk.adapter;
import android.content.Context;
import android.net.Uri;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ImageView;
@@ -10,6 +11,7 @@
import com.bsk.zhangbo.demoforbsk.R;
import com.bsk.zhangbo.demoforbsk.ui.activity.MainActivity;
import com.bsk.zhangbo.demoforbsk.ui.fragment.VisitorRegisterFragment;
import com.bsk.zhangbo.demoforbsk.util.AppApi;
import com.bsk.zhangbo.demoforbsk.util.WindowsUtil;
import com.camnter.easyrecyclerview.adapter.EasyRecyclerViewAdapter;
import com.camnter.easyrecyclerview.holder.EasyRecyclerViewHolder;
@@ -18,6 +20,7 @@
import java.util.List;
import cn.com.basic.face.discern.query.item.FacePhotoItem;
import cn.com.basic.face.discern.query.item.VisitorQueryItem;
/**
 * Created by zhangbo on 2017/2/15.
@@ -162,6 +165,25 @@
            }
        }
        nameTv.setText("");
        if (data instanceof VisitorQueryItem) {
            final VisitorQueryItem item = (VisitorQueryItem)data;
            nameTv.setText(item.getName());
            photoIv.setImageURI(Uri.parse(AppApi.CHENXINGGROUND_IMAGEURL_BASE+item.getImagePath()));
            if (1==1) {
                statusTv.setBackground(context.getDrawable(R.drawable.rectangle_textview));
                statusTv.setHeight((int)(context.getResources().getDisplayMetrics().density * 45));
                statusTv.setOnClickListener(new View.OnClickListener(){
                    @Override
                    public void onClick(View view) {
                        MainActivity.selectPage(2);
                        VisitorRegisterFragment.getInstance().visitorCheckIn(item);
                    }
                });
            }
        }
//        ImageView mSdv = holder.findViewById(R.id.item_user_bcg);
//        ViewGroup.LayoutParams mSdvLayoutParams = mSdv.getLayoutParams();
VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/service/VisitorCheckInMng.java
@@ -3,6 +3,7 @@
import android.widget.Toast;
import com.bsk.zhangbo.demoforbsk.base.BaseApplication;
import com.bsk.zhangbo.demoforbsk.ui.fragment.OneFragment;
import com.bsk.zhangbo.demoforbsk.ui.fragment.VisitorRegisterFragment;
import com.bsk.zhangbo.demoforbsk.util.AppApi;
@@ -43,6 +44,20 @@
    }
    /**
     * 查询来访人员列表
     */
    public void findVisitorList() {
        //id,名称,头像路径,联系电话,公司名称,证件编号
        RequestParams params = new RequestParams(AppApi.BASEURL+AppApi.VISITOR_LIST);
        params.addBodyParameter(VisitorQueryCondition.FieldNames.notCompanyId, BaseApplication.getInstance().getPlace().getCompanyId());
        x.http().post(params, new BaseCommonCallBack() {
            public void success() {
                OneFragment.getInstance().visitorListChanged(getList(VisitorQueryItem.class));
            }
        });
    }
    /**
     * 查询被访问人员列表
     */
    public void findIntervieweeList(String pageNum, String name, final boolean isClear) {
VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/ui/fragment/OneFragment.java
@@ -17,6 +17,7 @@
import com.bsk.zhangbo.demoforbsk.R;
import com.bsk.zhangbo.demoforbsk.adapter.OneBottomRecylerViewAdapter;
import com.bsk.zhangbo.demoforbsk.base.BaseFragment;
import com.bsk.zhangbo.demoforbsk.service.VisitorCheckInMng;
import com.bsk.zhangbo.demoforbsk.util.RtspFaceNative;
import com.bsk.zhangbo.demoforbsk.util.WindowsUtil;
import com.bsk.zhangbo.demoforbsk.widget.MyGLSurfaceView;
@@ -27,6 +28,7 @@
import java.util.List;
import cn.com.basic.face.discern.query.item.FacePhotoItem;
import cn.com.basic.face.discern.query.item.VisitorQueryItem;
/**
@@ -220,6 +222,14 @@
            }
            mList.add(item);
        }
        VisitorCheckInMng.getInstance().findVisitorList();
        mAdapter.setList(mList);
        mRecyclerViewRegister.setAdapter(mAdapter);
    }
    public void visitorListChanged(List<VisitorQueryItem> list) {
        mList.clear();
        mList.addAll(list);
        mAdapter.setList(mList);
        mRecyclerViewRegister.setAdapter(mAdapter);
    }
VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/ui/fragment/VisitorRegisterFragment.java
@@ -25,7 +25,6 @@
import com.bsk.zhangbo.demoforbsk.ui.activity.MainActivity;
import com.bsk.zhangbo.demoforbsk.util.AppApi;
import com.bsk.zhangbo.demoforbsk.util.Constant;
import com.bsk.zhangbo.demoforbsk.widget.SingleSelectionPopup;
import com.bsk.zhangbo.demoforbsk.widget.VisitPurposePopup;
import com.bsk.zhangbo.demoforbsk.widget.VisitorView;
import com.camnter.easyrecyclerview.widget.EasyRecyclerView;
@@ -43,7 +42,6 @@
import cn.com.basic.face.discern.common.CommonVariables;
import cn.com.basic.face.discern.entity.Visit;
import cn.com.basic.face.discern.query.item.FacePhotoItem;
import cn.com.basic.face.discern.query.item.IntervieweeQueryItem;
import cn.com.basic.face.discern.query.item.VisitorQueryItem;
/**
@@ -54,20 +52,20 @@
    private View mViewLeft,mViewRight;
    private RadioGroup mRGTop,mRGClass;
    private LinearLayout mLlRadioGroupClass;
    private VisitorView mVisitorTo,mVisitorFrom;
    private VisitorView right, left;
    private VisitorRecyclerViewAdapter mAdapter;
    private EasyRecyclerView mRecyclerView;
    private List mList = new ArrayList();;
    private static VisitorRegisterFragment instance = new VisitorRegisterFragment();
    private TextView companyNameTv;
    private TextView identity;
    private ImageView visitorPhoto;
    private TextView fromPhone;
    private TextView mDepartmentTv;
    private TextView mDutyTv;
    private TextView mPhoneTv;
    private TextView mTelTv;
    private TextView leftCompanyName;
    private TextView leftIdentityNumber;
    private ImageView leftPhoto;
    private TextView leftMobilePhone;
    private TextView rightDepartment;
    private TextView rightPost;
    private TextView rightMobilePhone;
    private TextView rightTel;
    //private TextView visitorReasonTv;
    private List<String> visitPurposeList = new ArrayList<String>();
    private VisitorQueryItem selectedVisitor;
@@ -83,7 +81,7 @@
    private RadioButton visitorRegisterRbLeft;
    @ViewInject(R.id.visitor_register_check_department)
    private RadioButton visitorRegisterCheckDepartment;
    private ImageView intevieweePhoto;
    private ImageView rightPhoto;
    public static VisitorRegisterFragment getInstance() {
        return instance;
@@ -210,32 +208,24 @@
    @Override
    public View addRightLayout() {
        mViewRight = LayoutInflater.from(getActivity()).inflate(R.layout.visitor_register_right,null);
        mVisitorFrom = (VisitorView) mViewRight.findViewById(R.id.visitor_from);
        companyNameTv = (TextView)mVisitorFrom.findViewById(R.id.visitor_view_from_company_name);
        left = (VisitorView) mViewRight.findViewById(R.id.visitor_view_left);
        left.setType(Constant.VISITOR_FROM);
        left.setTitle("");
        leftCompanyName = (TextView) left.findViewById(R.id.visitor_view_left_company_name);
        leftIdentityNumber = (TextView) left.findViewById(R.id.visitor_view_left_identity_number);
        leftMobilePhone = (TextView) left.findViewById(R.id.visitor_view_left_phone);
        leftPhoto = (ImageView) left.findViewById(R.id.visitor_view_left_photo);
        identity = (TextView)mVisitorFrom.findViewById(R.id.visitor_view_from_identity);
        fromPhone = (TextView)mVisitorFrom.findViewById(R.id.visitor_view_from_phone);
        visitorPhoto = (ImageView)mVisitorFrom.findViewById(R.id.visitor_view_from_photo);
        mVisitorTo = (VisitorView) mViewRight.findViewById(R.id.visitor_to);
        mDepartmentTv = (TextView)mVisitorTo.findViewById(R.id.view_visitor_to_deptartment);
        mDutyTv = (TextView)mVisitorTo.findViewById(R.id.view_visitor_to_duty);
        mPhoneTv = (TextView)mVisitorTo.findViewById(R.id.visitor_to_phone);
        mTelTv = (TextView)mVisitorTo.findViewById(R.id.visitor_to_tel);
        mVisitorFrom.setType(Constant.VISITOR_FROM);
        mVisitorTo.setType(Constant.VISITOR_TO);
        mVisitorFrom.setTitle("");
        mVisitorTo.setTitle("");
        intevieweePhoto = (ImageView)mVisitorTo.findViewById(R.id.visitor_view_to_photo);
        ViewUtils.inject(this, mVisitorTo);
        right = (VisitorView) mViewRight.findViewById(R.id.visitor_view_right);
        right.setType(Constant.VISITOR_TO);
        right.setTitle("");
        rightDepartment = (TextView) right.findViewById(R.id.view_visitor_right_deptartment);
        rightPost = (TextView) right.findViewById(R.id.view_visitor_right_post);
        rightMobilePhone = (TextView) right.findViewById(R.id.visitor_right_phone);
        rightTel = (TextView) right.findViewById(R.id.visitor_right_tel);
        rightPhoto = (ImageView) right.findViewById(R.id.visitor_view_right_photo);
        ViewUtils.inject(this, mViewRight);
        return mViewRight;
    }
@@ -283,7 +273,34 @@
    }
    public void visitorCheckIn(FacePhotoItem item) {
        mVisitorFrom.setTitle(item.getName());
        left.setTitle(item.getName());
    }
    public void visitorCheckIn(VisitorQueryItem item) {
        left.setTitle(item.getName());
        leftMobilePhone.setText(item.getMobilePhone());
        leftCompanyName.setText(item.getCompanyName());
        leftIdentityNumber.setText(item.getIdentify());
        leftPhoto.setImageURI(Uri.parse(AppApi.CHENXINGGROUND_IMAGEURL_BASE + item.getImagePath()));
        /*
                left = (VisitorView) mViewRight.findViewById(R.id.visitor_view_left);
        left.setType(Constant.VISITOR_FROM);
        left.setTitle("");
        leftCompanyName = (TextView) left.findViewById(R.id.visitor_view_left_company_name);
        leftIdentityNumber = (TextView) left.findViewById(R.id.visitor_view_left_identity_number);
        leftPhone = (TextView) left.findViewById(R.id.visitor_view_left_phone);
        leftPhoto = (ImageView) left.findViewById(R.id.visitor_view_left_photo);
        right = (VisitorView) mViewRight.findViewById(R.id.visitor_view_right);
        right.setType(Constant.VISITOR_TO);
        right.setTitle("");
        rightDepartment = (TextView) right.findViewById(R.id.view_visitor_right_deptartment);
        rightPost = (TextView) right.findViewById(R.id.view_visitor_right_post);
        rightMobilePhone = (TextView) right.findViewById(R.id.visitor_right_phone);
        rightTel = (TextView) right.findViewById(R.id.visitor_right_tel);
        rightPhoto = (ImageView) right.findViewById(R.id.visitor_view_right_photo);
         */
    }
    public void listChanged(List list, boolean isClear) {
@@ -301,31 +318,31 @@
    }
    public void setVisitorInfo(VisitorQueryItem item) {
        mVisitorFrom.setTitle(item.getName());
        companyNameTv.setText(item.getCompanyName());
        identity.setText(item.getIdentify());
        fromPhone.setText(item.getPhone());
        visitorPhoto.setImageURI(Uri.parse(AppApi.CHENXINGGROUND_IMAGEURL_BASE + item.getImagePath()));
        left.setTitle(item.getName());
        leftCompanyName.setText(item.getCompanyName());
        leftIdentityNumber.setText(item.getIdentify());
        leftMobilePhone.setText(item.getPhone());
        leftPhoto.setImageURI(Uri.parse(AppApi.CHENXINGGROUND_IMAGEURL_BASE + item.getImagePath()));
        selectedVisitor = item;
    }
    public void setIntervieweeInfo(final VisitorQueryItem item) {
        mVisitorTo.setTitle(item.getName());
        mDepartmentTv.setText(item.getDeptName());
        mDutyTv.setText(item.getPostName());
        mPhoneTv.setOnClickListener(new View.OnClickListener(){
        right.setTitle(item.getName());
        rightDepartment.setText(item.getDeptName());
        rightPost.setText(item.getPostName());
        rightMobilePhone.setOnClickListener(new View.OnClickListener(){
            @Override
            public void onClick(View view) {
                Toast.makeText(MainActivity.getInstance(), "正在呼叫手机"+item.getMobilePhone(), Toast.LENGTH_SHORT).show();
            }
        });
        mTelTv.setOnClickListener(new View.OnClickListener(){
        rightTel.setOnClickListener(new View.OnClickListener(){
            @Override
            public void onClick(View view) {
                Toast.makeText(MainActivity.getInstance(), "正在呼叫座机"+item.getPhone(), Toast.LENGTH_SHORT).show();
            }
        });
        intevieweePhoto.setImageURI(Uri.parse(AppApi.CHENXINGGROUND_IMAGEURL_BASE + item.getImagePath()));
        rightPhoto.setImageURI(Uri.parse(AppApi.CHENXINGGROUND_IMAGEURL_BASE + item.getImagePath()));
        selectedInterviewee = item;
    }
VisitFace/DemoForBsk/app/src/main/res/layout/item_visitor_user.xml
@@ -4,7 +4,7 @@
    android:layout_width="wrap_content"
    android:layout_height="wrap_content">
    <ImageView
    <com.facebook.drawee.view.SimpleDraweeView
        android:id="@+id/item_user_bcg"
        android:layout_width="104dp"
        android:layout_height="127dp"
@@ -35,7 +35,7 @@
            android:layout_width="@dimen/view_size_0"
            android:layout_height="match_parent"
            android:layout_weight="1"
            android:text="大神大神"
            android:text=""
            android:textSize="@dimen/text_size_small"
            android:gravity="center"
            android:textColor="@android:color/white"/>
@@ -48,7 +48,7 @@
            android:layout_width="@dimen/view_size_0"
            android:layout_height="match_parent"
            android:layout_weight="1"
            android:text="来当登记"
            android:text="来访登记"
            android:textSize="@dimen/text_size_small"
            android:gravity="center"
            android:textColor="@android:color/white"/>
VisitFace/DemoForBsk/app/src/main/res/layout/view_visitor.xml
@@ -25,7 +25,7 @@
        android:layout_height="wrap_content"
        android:orientation="vertical">
        <com.facebook.drawee.view.SimpleDraweeView
            android:id="@+id/visitor_view_to_photo"
            android:id="@+id/visitor_view_right_photo"
            android:layout_width="100dp"
            android:layout_height="100dp"
            fresco:roundAsCircle = "true"
@@ -45,7 +45,7 @@
                android:textSize="@dimen/text_size_big"
                android:textColor="@color/colorText_5"/>
            <TextView
                android:id="@+id/view_visitor_to_deptartment"
                android:id="@+id/view_visitor_right_deptartment"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:text=""
@@ -65,7 +65,7 @@
                android:textSize="@dimen/text_size_big"
                android:textColor="@color/colorText_5"/>
            <TextView
                android:id="@+id/view_visitor_to_duty"
                android:id="@+id/view_visitor_right_post"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:text=""
@@ -79,7 +79,7 @@
            android:gravity="center_horizontal"
            android:orientation="horizontal">
            <TextView
                android:id="@+id/visitor_to_phone"
                android:id="@+id/visitor_right_phone"
                android:layout_width="90dp"
                android:layout_height="36dp"
                android:gravity="center"
@@ -87,7 +87,7 @@
                android:background="@drawable/main_btn_bcg"
                android:text="呼叫手机"/>
            <TextView
                android:id="@+id/visitor_to_tel"
                android:id="@+id/visitor_right_tel"
                android:layout_width="90dp"
                android:layout_height="36dp"
                android:gravity="center"
@@ -107,7 +107,7 @@
        android:visibility="gone"
        android:orientation="vertical">
        <com.facebook.drawee.view.SimpleDraweeView
            android:id="@+id/visitor_view_from_photo"
            android:id="@+id/visitor_view_left_photo"
            android:layout_width="100dp"
            android:layout_height="100dp"
            fresco:roundAsCircle = "true"
@@ -126,7 +126,7 @@
                android:textSize="@dimen/text_size_big"
                android:textColor="@color/colorText_5"/>
            <TextView
                android:id="@+id/visitor_view_from_phone"
                android:id="@+id/visitor_view_left_phone"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:text=""
@@ -145,7 +145,7 @@
                android:textSize="@dimen/text_size_big"
                android:textColor="@color/colorText_5"/>
            <TextView
                android:id="@+id/visitor_view_from_company_name"
                android:id="@+id/visitor_view_left_company_name"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:text=""
@@ -164,7 +164,7 @@
                android:textSize="@dimen/text_size_big"
                android:textColor="@color/colorText_5"/>
            <TextView
                android:id="@+id/visitor_view_from_identity"
                android:id="@+id/visitor_view_left_identity_number"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:text=""
VisitFace/DemoForBsk/app/src/main/res/layout/visitor_register_right.xml
@@ -68,14 +68,14 @@
                android:layout_height="wrap_content"
                android:orientation="horizontal">
                <com.bsk.zhangbo.demoforbsk.widget.VisitorView
                    android:id="@+id/visitor_from"
                    android:id="@+id/visitor_view_left"
                    android:layout_width="254dp"
                    android:layout_height="350dp"
                    android:background="@drawable/card_bcg"
                    android:orientation="vertical"></com.bsk.zhangbo.demoforbsk.widget.VisitorView>
                <com.bsk.zhangbo.demoforbsk.widget.VisitorView
                    android:id="@+id/visitor_to"
                    android:id="@+id/visitor_view_right"
                    android:layout_width="254dp"
                    android:layout_height="350dp"
                    android:background="@drawable/card_bcg"