xuxiuxi
2017-04-12 80a6fefdcbee2c256570987efdfff17aec498047


git-svn-id: http://192.168.1.226/svn/proxy@429 454eff88-639b-444f-9e54-f578c98de674
4个文件已删除
5个文件已修改
113 ■■■■ 已修改文件
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/condition/VisitQueryCondition.java 34 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/AttendanceMng.java 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/VisitMng.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/vo/AttendanceFragment.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/vo/CheckInFragment.java 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/vo/PhoneCallFragment.java 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/vo/VisitFragment.java 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/RtspFaceNative.java 29 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/phonecall/PhoneCallLeftListView.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/condition/VisitQueryCondition.java
@@ -5,30 +5,50 @@
    public static final class FieldNames {
        /**
         * 公司主键
         */
        public static final String companyId = "companyId";
        /**
         * 人员名字
         */
        public static final String name = "name";
        public static final String username = "username";
    }
    // 公司主键
    private String companyId;
    // 人员名字
    private String name;
    private String username;
    /**
     * Get 公司主键
     */
    public String getCompanyId() {
        return companyId;
    }
    /**
     * Set 公司主键
     */
    public void setCompanyId(String companyId) {
        this.companyId = companyId;
    }
    /**
     * Get 人员名字
     */
    public String getName() {
        return name;
    public String getUsername() {
        return username;
    }
    /**
     * Set 人员名字
     */
    public void setName(String name) {
        this.name = name;
    public void setUsername(String username) {
        this.username = username;
    }
    public String toString() {
        return 
             ",人员名字 =" + name      ;
                ",公司主键 =" + companyId  +  ",人员名字 =" + username  ;
    }
}
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/AttendanceMng.java
@@ -9,11 +9,9 @@
import cn.com.basic.face.discern.common.BaseCommonCallBack;
import cn.com.basic.face.discern.query.condition.AttendanceDetailQueryCondition;
import cn.com.basic.face.discern.query.condition.AttendanceQueryCondition;
import cn.com.basic.face.discern.query.condition.VisitorQueryCondition;
import cn.com.basic.face.discern.query.item.AttendanceDetailQueryItem;
import cn.com.basic.face.discern.query.item.AttendanceQueryItem;
import cn.com.basic.face.fragment.AttendanceFragment;
import cn.com.basic.face.service.vo.VisitFragment;
import cn.com.basic.face.util.AppApi;
public class AttendanceMng {
@@ -25,7 +23,7 @@
    public void reloadLeftList(String searchText) {
        RequestParams params = new RequestParams(AppApi.BASE_URL +AppApi.Query.ATTENDANCE_QUERY);
//        params.addBodyParameter(AttendanceQueryCondition.FieldNames, searchText);
        params.addBodyParameter(AttendanceQueryCondition.FieldNames.username, searchText);
        x.http().post(params, new BaseCommonCallBack() {
            public void success() {
                List<AttendanceQueryItem> list = getList(AttendanceQueryItem.class);
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/VisitMng.java
@@ -20,7 +20,7 @@
    public void findLeftVisitorList(String searchText) {
        RequestParams params = new RequestParams(AppApi.BASE_URL +AppApi.Query.VISIT_QUERY);
        params.addBodyParameter(VisitQueryCondition.FieldNames.name, searchText);
        params.addBodyParameter(VisitQueryCondition.FieldNames.username, searchText);
        x.http().post(params, new BaseCommonCallBack() {
            public void success() {
                List<VisitQueryItem> list = getList(VisitQueryItem.class);
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/vo/AttendanceFragment.java
File was deleted
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/vo/CheckInFragment.java
File was deleted
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/vo/PhoneCallFragment.java
File was deleted
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/vo/VisitFragment.java
File was deleted
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/RtspFaceNative.java
@@ -14,7 +14,6 @@
public class RtspFaceNative {
    public static native void init();
    public static native void setSurface(int cameraIdx, Surface surface);
    public static native boolean createPlayer(int cameraIdx, String uri);
@@ -36,7 +35,33 @@
        byte[] faceImages = new byte[1024 * 1024 * 1];
        ArrayList<NativeImgIdx> faceImagesIdx = getFaceImages(cameraIdx, faceImages);
        int c = faceImagesIdx.size();
        int c = 0;
        if (faceImagesIdx != null)
            c = faceImagesIdx.size();
        for (int i = 0; i < c; i++) {
            System.out.println(i);
//            faceImagesIdx.get(i).offset, faceImagesIdx.get(i).size;
            try {
                File path = BaseApplication.getInstance().getFilesDir();
                File f1 = new File(path, ""+i);
                if (!f1.exists()) {
                    f1.createNewFile();
                }
                FileOutputStream f = new FileOutputStream(f1);
                f.write(faceImages, faceImagesIdx.get(i).offset, faceImagesIdx.get(i).size);
                f.close();
                RequestParams params = new RequestParams();
//                String encodedImage = Base64.encodeToString(faceImages, Base64.DEFAULT);
                params.addBodyParameter("choosePhoto", f1);
                RegisterMng.getInstance().add(params);
            } catch (Exception e) {
                e.printStackTrace();
            }
        }
        releaseFace(cameraIdx);
    }
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/phonecall/PhoneCallLeftListView.java
@@ -5,12 +5,9 @@
import com.camnter.easyrecyclerview.widget.EasyRecyclerView;
import cn.com.basic.face.adapter.CheckInFragment;
import cn.com.basic.face.adapter.PhoneCallFragment.PhoneCallLeftAdapter;
import java.util.List;
import cn.com.basic.face.service.vo.PhoneCallFragment;
public class PhoneCallLeftListView extends EasyRecyclerView {