xuxiuxi

2017-07-19 d139906e39aa91d57eb38a6b3e768718eef56333

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

 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/AttendanceFragment.java

@@ -82,7 +82,8 @@
                RelativeLayout fragment_attendance_left_relative_layout = viewHolder.findViewById(R.id.fragment_attendance_left_relative_layout);

                final AttendanceQueryItem item = getItem(position);



                fragment_visit_left_person_row_status.setText(item.getAttendanceType());

//                fragment_visit_left_person_row_status.setText(item.getAttendanceType());

                fragment_visit_left_person_row_status.setVisibility(View.GONE);



                fragment_attendance_left_relative_layout.setOnClickListener(new View.OnClickListener() {

                    @Override


 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/condition/AttendanceQueryCondition.java

@@ -5,13 +5,33 @@


    public static final class FieldNames {

        /**

         *

         */

        public static final String deviceCompanyId = "deviceCompanyId";

        /**

         * 人员名字

         */

        public static final String username = "username";

    }



    //

    private String deviceCompanyId;

    // 人员名字

    private String username;



    /**

     * Get

     */

    public String getDeviceCompanyId() {

        return deviceCompanyId;

    }



    /**

     * Set

     */

    public void setDeviceCompanyId(String deviceCompanyId) {

        this.deviceCompanyId = deviceCompanyId;

    }



    /**

     * Get 人员名字

@@ -29,6 +49,6 @@


    public String toString() {

        return

                ",人员名字 =" + username  ;

                ", ="     + deviceCompanyId +  ",人员名字 =" + username  ;

    }

}


 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/AttendanceQueryItem.java

@@ -11,16 +11,12 @@
    private String surveillancePhoto;

    // 证件编号

    private String identifyNum;

    // 名称

    private String gender;

    // 职位名称

    private String postName;

    // 名称

    private String gender;

    // 部门名称

    private String deptName;

    // 
    private String time;

    // 
    private String attendanceType;



    /**

     * Get 人员主键

@@ -28,7 +24,7 @@
    public String getRegisterId() {

        return registerId;

    }

	


    /**

     * Set 人员主键

     */

@@ -42,7 +38,7 @@
    public String getUsername() {

        return username;

    }

	


    /**

     * Set 人员名字

     */

@@ -56,7 +52,7 @@
    public String getSurveillancePhoto() {

        return surveillancePhoto;

    }

	


    /**

     * Set 监控图片

     */

@@ -70,7 +66,7 @@
    public String getIdentifyNum() {

        return identifyNum;

    }

	


    /**

     * Set 证件编号

     */

@@ -79,26 +75,12 @@
    }



    /**

     * Get 名称

     */

    public String getGender() {

        return gender;

    }

	
    /**

     * Set 名称

     */

    public void setGender(String gender) {

        this.gender = gender;

    }



    /**

     * Get 职位名称

     */

    public String getPostName() {

        return postName;

    }

	


    /**

     * Set 职位名称

     */

@@ -107,12 +89,26 @@
    }



    /**

     * Get 名称

     */

    public String getGender() {

        return gender;

    }



    /**

     * Set 名称

     */

    public void setGender(String gender) {

        this.gender = gender;

    }



    /**

     * Get 部门名称

     */

    public String getDeptName() {

        return deptName;

    }

	


    /**

     * Set 部门名称

     */

@@ -120,39 +116,10 @@
        this.deptName = deptName;

    }



    /**

     * Get 
     */

    public String getTime() {

        return time;

    }

	
    /**

     * Set 
     */

    public void setTime(String time) {

        this.time = time;

    }



    /**

     * Get 
     */

    public String getAttendanceType() {

        return attendanceType;

    }

	
    /**

     * Set 
     */

    public void setAttendanceType(String attendanceType) {

        this.attendanceType = attendanceType;

    }



    public String toString() {

        return 
             ",人员主键 =" + registerId +  ",人员名字 =" + username   +  ",监控图片 =" + surveillancePhoto + 
             ",证件编号 =" + identifyNum +  ",名称 ="   + gender     +  ",职位名称 =" + postName   + 
             ",部门名称 =" + deptName   +  ", ="     + time       +  ", ="     + attendanceType

            ;

        return

                ",人员主键 =" + registerId +  ",人员名字 =" + username   +  ",监控图片 =" + surveillancePhoto +

                        ",证件编号 =" + identifyNum +  ",职位名称 =" + postName   +  ",名称 ="   + gender     +

                        ",部门名称 =" + deptName  ;

    }

}


 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/AttendanceMng.java

@@ -36,6 +36,7 @@
        } else {

            RequestParams params = new RequestParams(AppApi.BASE_URL + AppApi.Query.ATTENDANCE_QUERY);

            params.addBodyParameter(AttendanceQueryCondition.FieldNames.username, searchText);

            params.addBodyParameter(AttendanceQueryCondition.FieldNames.deviceCompanyId, BaseApplication.getInstance().getAndroidDevice().getCompanyId());

            params.addBodyParameter(CommonVariables.Page.PAGE_NUM, pageNum + "");

            params.addBodyParameter(CommonVariables.Page.PAGE_SIZE, CommonVariables.Page.DEFAULT_PAGE_SIZE);

            x.http().post(params, new BaseCommonCallBack() {

@@ -45,21 +46,21 @@
                    int i = 0;

                    String previewDate = "";

                    if (append) {

                        List prevList = AttendanceFragment.getInstance().get_fragment_attendance_left_list_view().getPrevList();

                        if (prevList != null && prevList.size() > 1) {

                            previewDate = DateUtil.yyyy_MM_dd_to_yyyy年MM月dd日(

                                    ((AttendanceQueryItem) prevList.get(prevList.size() - 2)).getTime());

                        }

//                        List prevList = AttendanceFragment.getInstance().get_fragment_attendance_left_list_view().getPrevList();

//                        if (prevList != null && prevList.size() > 1) {

//                            previewDate = DateUtil.yyyy_MM_dd_to_yyyy年MM月dd日(

//                                    ((AttendanceQueryItem) prevList.get(prevList.size() - 2)).getTime());

//                        }

                    }

                    for (AttendanceQueryItem item : list) {

                        try {

                            String yyyyMMdd = DateUtil.yyyy_MM_dd_to_yyyy年MM月dd日(item.getTime());

                            if (!previewDate.equals(yyyyMMdd)) {

                                itemList.add(yyyyMMdd);

                                previewDate = yyyyMMdd;

                            }

                        } catch (Exception e) {

                        }

//                        try {

//                            String yyyyMMdd = DateUtil.yyyy_MM_dd_to_yyyy年MM月dd日(item.getTime());

//                            if (!previewDate.equals(yyyyMMdd)) {

//                                itemList.add(yyyyMMdd);

//                                previewDate = yyyyMMdd;

//                            }

//                        } catch (Exception e) {

//                        }

                        itemList.add(item);

                        i++;

                    }

@@ -77,7 +78,7 @@
        try {

            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");

            RequestParams params = new RequestParams(AppApi.BASE_URL +AppApi.Query.ATTENDANCE_DETAIL_QUERY);

            params.addBodyParameter(AttendanceDetailQueryCondition.FieldNames.time, sdf.format(sdf.parse(item.getTime())));

            //params.addBodyParameter(AttendanceDetailQueryCondition.FieldNames.time, sdf.format(sdf.parse(item.getTime())));

            params.addBodyParameter(AttendanceDetailQueryCondition.FieldNames.registerId, item.getRegisterId());

            params.addBodyParameter(AttendanceDetailQueryCondition.FieldNames.deviceCompanyId, BaseApplication.getInstance().getAndroidDevice().getCompanyId());

            params.addBodyParameter(CommonVariables.Page.PAGE_SIZE, "20");


 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/SurveillanceDao.java

@@ -1,9 +1,15 @@
package cn.com.basic.face.service.sqlite;



import android.graphics.Bitmap;



import java.text.SimpleDateFormat;

import java.util.Date;

import java.util.List;

import java.util.UUID;



import cn.com.basic.face.discern.query.item.SurveillancePhotoQueryItem;

import cn.com.basic.face.discern.query.item.SurveillanceQueryItem;

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



public class SurveillanceDao {



@@ -12,10 +18,33 @@
        return instance;

    }



    //temp_table           (headPicture, cameraInOrOut, createTime, visitId)

    //offline_           (headPicture, cameraInOrOut, createTime, visitId)

    public void addBitmap(final List<SurveillanceQueryItem> bitmapList, final byte[] byteArray, int len, final String cameraInOrOut, byte[] surveillancePhotoBytes) {





        for (SurveillanceQueryItem item : bitmapList) {

            Bitmap bitmap = item.getBitmap();

            String fileName = UUID.randomUUID().toString()+".bmp";

            FileUtil.writeToFile(fileName, new byte[]{});



        }



        String headPicture = "";

        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");

        String createTime = sdf.format(new Date());

        String sql = "insert offline_temp(head_picture, camera_in_or_out, create_time, visit_id) values('"+

                headPicture+"','"+

                cameraInOrOut+"','"+

                createTime+"','"+

               "null" +"')";

        //存入数据库

        //把图片存入本地文件

        //人员注册可以选择本地图片

        //同步临时表



        //同步访客登记表



        //删除本地文件（循环删除）



    }