xuxiuxi

2017-04-25 241bb308ff7f40269952fab927001a783b7271f7

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

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

@@ -23,6 +23,8 @@
    private String postName;

    // 移动电话

    private String mobilePhone;

    // 危险人员警告消息

    private String warning;



    /**

     * Get 人员主键

@@ -30,7 +32,7 @@
    public String getRegisterId() {

        return registerId;

    }

	


    /**

     * Set 人员主键

     */

@@ -44,7 +46,7 @@
    public String getUsername() {

        return username;

    }

	


    /**

     * Set 人员名字

     */

@@ -58,7 +60,7 @@
    public String getSurveillancePhoto() {

        return surveillancePhoto;

    }

	


    /**

     * Set 监控图片

     */

@@ -72,7 +74,7 @@
    public String getCompanyName() {

        return companyName;

    }

	


    /**

     * Set 公司名称

     */

@@ -86,7 +88,7 @@
    public String getTel() {

        return tel;

    }

	


    /**

     * Set 座机电话

     */

@@ -100,7 +102,7 @@
    public String getIdentifyNum() {

        return identifyNum;

    }

	


    /**

     * Set 证件编号

     */

@@ -114,7 +116,7 @@
    public String getDeptName() {

        return deptName;

    }

	


    /**

     * Set 部门名称

     */

@@ -128,7 +130,7 @@
    public String getCompanyId() {

        return companyId;

    }

	


    /**

     * Set 公司主键

     */

@@ -142,7 +144,7 @@
    public String getPostName() {

        return postName;

    }

	


    /**

     * Set 职位名称

     */

@@ -156,7 +158,7 @@
    public String getMobilePhone() {

        return mobilePhone;

    }

	


    /**

     * Set 移动电话

     */

@@ -164,11 +166,19 @@
        this.mobilePhone = mobilePhone;

    }



    public String getWarning() {

        return warning;

    }



    public void setWarning(String warning) {

        this.warning = warning;

    }



    public String toString() {

        return 
             ",人员主键 =" + registerId +  ",人员名字 =" + username   +  ",监控图片 =" + surveillancePhoto + 
             ",公司名称 =" + companyName +  ",座机电话 =" + tel        +  ",证件编号 =" + identifyNum + 
             ",部门名称 =" + deptName   +  ",公司主键 =" + companyId  +  ",职位名称 =" + postName   + 
             ",移动电话 =" + mobilePhone;

        return

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

                        ",公司名称 =" + companyName +  ",座机电话 =" + tel        +  ",证件编号 =" + identifyNum +

                        ",部门名称 =" + deptName   +  ",公司主键 =" + companyId  +  ",职位名称 =" + postName   +

                        ",移动电话 =" + mobilePhone;

    }

}


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

@@ -178,11 +178,13 @@
        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");

        params.addBodyParameter(Visit.FieldNames.enterTime, sdf.format(new Date()));

        params.addBodyParameter(Visit.FieldNames.currentStateId, ""+CommonVariables.VisitType.VISITOR_ENTERED);

        params.addBodyParameter(Visit.FieldNames.warning, visitor.getWarning());



        params.addBodyParameter(VisitDetail.FieldNames.stateId, ""+CommonVariables.VisitType.VISITOR_ENTERED);

        params.addBodyParameter(VisitDetail.FieldNames.createTime, sdf.format(new Date()));

        params.addBodyParameter(VisitDetail.FieldNames.deviceId, BaseApplication.getInstance().getDevice().getDeviceId());





        CheckInMng.getInstance().add(params, visitReasonId);

    }




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

@@ -258,6 +258,7 @@
                byte[] imageBytes = byteArrayOutputStream.toByteArray();

                String encodedImage = Base64.encodeToString(imageBytes, Base64.DEFAULT);

                item.setBase64Image(encodedImage);

                setSurveillanceQueryItem(item);



                SurveillanceMng.getInstance().addBitmap(bitmapList, null, 0, CommonVariables.Camera.IN);




 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/RtspFaceNative.java

@@ -109,7 +109,7 @@
                Bitmap bitmap = Bitmap.createBitmap(item.width,item.height, Bitmap.Config.RGB_565);

                ByteBuffer byteBuffer = ByteBuffer.wrap(item.image, offset, size);

                bitmap.copyPixelsFromBuffer(byteBuffer);

                surveillanceQueryItem.setBase64Bitmap(Base64.encodeToString(item.image, offset, size, Base64.DEFAULT));

                surveillanceQueryItem.setBase64Image(Base64.encodeToString(item.image, offset, size, Base64.DEFAULT));

                surveillanceQueryItem.setBitmap(bitmap);

                surveillanceQueryItem.setWidth(item.width+"");

                surveillanceQueryItem.setHeight(item.height+"");