xuxiuxi
2017-04-20 23c6ff50631129ed2ec78effc1b80c79d07aa748


git-svn-id: http://192.168.1.226/svn/proxy@508 454eff88-639b-444f-9e54-f578c98de674
6个文件已修改
128 ■■■■ 已修改文件
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/common/CommonVariables.java 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/PhoneCall.java 42 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/SurveillanceFragment.java 28 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/PhoneCallMng.java 28 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/AppApi.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/checkin/CheckInRightIntervieweeCell.java 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/common/CommonVariables.java
@@ -75,4 +75,21 @@
        public static final String OUT = "2";
    }
    /*{
        "ret":0,
        "count":3,
        "result":[[-1,123],[2,456],[0,0]]
    }*/
    /**
     * [-1RecogonizeResult
     */
    public static class RecognizeResult {
        public static final int RET = 0;
        public static final int FIRST_ELEMENT_NOT_FOUND = 0;
        public static final int FIRST_ELEMENT_POSITIVE = 1;//company id parameter.
        public static final int FIRST_ELEMENT_NEGATIVE = -1;//访客数据库找到了。
    }
}
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/PhoneCall.java
@@ -22,15 +22,15 @@
        /**
         * 呼叫时间
         */
        public static final String callDatetime = "callDatetime";
        public static final String date = "date";
        /**
         * 呼叫人员主键
         */
        public static final String callerPersonId = "callerPersonId";
        public static final String callerId = "callerId";
        /**
         * 被呼叫人员主键
         */
        public static final String calleePersonId = "calleePersonId";
        public static final String calleeId = "calleeId";
        /**
         * 呼叫发生所在设备(地点)
         */
@@ -40,11 +40,11 @@
    // 签到事件主键
    private String phoneCallId;
    // 呼叫时间
    private String callDatetime;
    private String date;
    // 呼叫人员主键
    private String callerPersonId;
    private String callerId;
    // 被呼叫人员主键
    private String calleePersonId;
    private String calleeId;
    // 呼叫发生所在设备(地点)
    private String deviceId;
@@ -65,43 +65,43 @@
    /**
     * Get 呼叫时间
     */
    public String getCallDatetime() {
        return callDatetime;
    public String getDate() {
        return date;
    }
    /**
     * Set 呼叫时间
     */
    public void setCallDatetime(String callDatetime) {
        this.callDatetime = callDatetime;
    public void setDate(String date) {
        this.date = date;
    }
    /**
     * Get 呼叫人员主键
     */
    public String getCallerPersonId() {
        return callerPersonId;
    public String getCallerId() {
        return callerId;
    }
    /**
     * Set 呼叫人员主键
     */
    public void setCallerPersonId(String callerPersonId) {
        this.callerPersonId = callerPersonId;
    public void setCallerId(String callerId) {
        this.callerId = callerId;
    }
    /**
     * Get 被呼叫人员主键
     */
    public String getCalleePersonId() {
        return calleePersonId;
    public String getCalleeId() {
        return calleeId;
    }
    /**
     * Set 被呼叫人员主键
     */
    public void setCalleePersonId(String calleePersonId) {
        this.calleePersonId = calleePersonId;
    public void setCalleeId(String calleeId) {
        this.calleeId = calleeId;
    }
    /**
@@ -119,8 +119,8 @@
    }
    public String toString() {
        return
             ",签到事件主键 ="+ phoneCallId +  ",呼叫时间 =" + callDatetime +  ",呼叫人员主键 ="+ callerPersonId +
             ",被呼叫人员主键 ="+ calleePersonId +  ",呼叫发生所在设备(地点) ="+ deviceId  ;
        return
                ",签到事件主键 ="+ phoneCallId +  ",呼叫时间 =" + date       +  ",呼叫人员主键 ="+ callerId   +
                        ",被呼叫人员主键 ="+ calleeId   +  ",呼叫发生所在设备(地点) ="+ deviceId  ;
    }
}
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/SurveillanceFragment.java
@@ -104,20 +104,20 @@
                } catch (Exception e) {
                    e.printStackTrace();
                }
                try {
                    final SimpleDateFormat sdf = new SimpleDateFormat("yyyy年MM月dd日  HH:mm:ss分");
                    while (true) {
                        Thread.sleep(1000);
                        MainActivity.getInstance().runOnUiThread(new Runnable() {
                            @Override
                            public void run() {
                                fragment_surveillance_enter_timer.setText(sdf.format(new Date()));
                                fragment_surveillance_exit_timer.setText(sdf.format(new Date()));
                            }
                        });
                    }
                } catch (InterruptedException e) {
                }
//                try {
//                    final SimpleDateFormat sdf = new SimpleDateFormat("yyyy年MM月dd日  HH:mm:ss分");
//                    while (true) {
//                        Thread.sleep(1000);
//                        MainActivity.getInstance().runOnUiThread(new Runnable() {
//                            @Override
//                            public void run() {
//                                fragment_surveillance_enter_timer.setText(sdf.format(new Date()));
//                                fragment_surveillance_exit_timer.setText(sdf.format(new Date()));
//                            }
//                        });
//                    }
//                } catch (InterruptedException e) {
//                }
            }
        }).start();
        reloadBottomList();
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/PhoneCallMng.java
@@ -1,18 +1,26 @@
package cn.com.basic.face.service;
import android.widget.Toast;
import org.xutils.http.RequestParams;
import org.xutils.x;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
import java.util.Date;
import java.util.List;
import cn.com.basic.face.base.BaseApplication;
import cn.com.basic.face.base.MainActivity;
import cn.com.basic.face.discern.common.BaseCommonCallBack;
import cn.com.basic.face.discern.common.CommonVariables;
import cn.com.basic.face.discern.entity.PhoneCall;
import cn.com.basic.face.discern.query.condition.PhoneCallQueryCondition;
import cn.com.basic.face.discern.query.item.CheckInQueryItem;
import cn.com.basic.face.discern.query.item.PhoneCallQueryItem;
import cn.com.basic.face.fragment.CheckInFragment;
import cn.com.basic.face.fragment.PhoneCallFragment;
import cn.com.basic.face.util.AppApi;
import cn.com.basic.face.util.CharacterParser;
@@ -106,5 +114,25 @@
        });
    }
    public void addPhoneCall(CheckInQueryItem visitor, CheckInQueryItem interviewee) {
        if (visitor == null) {
            Toast.makeText(MainActivity.getInstance(), "请先选择被访人", Toast.LENGTH_SHORT).show();
            return;
        }
        if (interviewee == null) {
            Toast.makeText(MainActivity.getInstance(), "请先选择被访人", Toast.LENGTH_SHORT).show();
            return;
        }
        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
        RequestParams params = new RequestParams(AppApi.BASE_URL +AppApi.Query.PHONE_CALL_QUERY);
        params.addBodyParameter(PhoneCall.FieldNames.date, sdf.format(new Date()));
        params.addBodyParameter(PhoneCall.FieldNames.calleeId, interviewee.getRegisterId());
        params.addBodyParameter(PhoneCall.FieldNames.deviceId, BaseApplication.getInstance().getDevice().getDeviceId());
        params.addBodyParameter(PhoneCall.FieldNames.callerId, visitor.getRegisterId());
        x.http().post(params, new BaseCommonCallBack() {
            public void success() {
            }
        });
    }
}
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/AppApi.java
@@ -10,6 +10,8 @@
    public final static String SURVEILLANCE_UPLOAD = "Surveillance/o_upload.do";
    public static final String PHONE_CALL_ADD = "PhoneCall/o_add.do";
    public static class Query {
        public final static String SURVEILLANCE_QUERY = "querySurveillance/v_list.do";
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/checkin/CheckInRightIntervieweeCell.java
@@ -16,8 +16,17 @@
import com.lidroid.xutils.view.annotation.ViewInject;
import com.lidroid.xutils.view.annotation.event.OnClick;
import org.xutils.http.RequestParams;
import java.text.SimpleDateFormat;
import java.util.Date;
import cn.com.basic.face.base.BaseApplication;
import cn.com.basic.face.base.MainActivity;
import cn.com.basic.face.discern.entity.PhoneCall;
import cn.com.basic.face.discern.query.item.CheckInQueryItem;
import cn.com.basic.face.fragment.CheckInFragment;
import cn.com.basic.face.service.PhoneCallMng;
import cn.com.basic.face.util.AppApi;
public class CheckInRightIntervieweeCell extends LinearLayout{
@@ -71,7 +80,7 @@
    @OnClick(R.id.fragment_check_in_right_interviewee_cell_call_mobile)
    public void fragment_check_in_right_interviewee_cell_call_mobile_click(View view) {
        Toast.makeText(MainActivity.getInstance(), "正在呼叫手机"+item.getMobilePhone(), Toast.LENGTH_SHORT).show();
        PhoneCallMng.getInstance().addPhoneCall(CheckInFragment.getInstance().getFragment_check_in_right_visitor_cell().getVisitor(), item);
    }
    public void resetForm() {