xuxiuxi
2017-07-25 0e8fc8d9e8764432ffa2ef574b979f003fe4503b


git-svn-id: http://192.168.1.226/svn/proxy@886 454eff88-639b-444f-9e54-f578c98de674
1个文件已添加
5个文件已修改
193 ■■■■ 已修改文件
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/OfflineAttenderRegisterItem.java 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/OfflineRegisterItem.java 60 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/OfflineVisitorRegisterItem.java 52 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/RegisterDao.java 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sync/up/AttenderRegisterUpSync.java 49 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sync/up/VisitorRegisterUpSync.java 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/OfflineAttenderRegisterItem.java
@@ -2,15 +2,6 @@
import cn.com.basic.face.discern.entity.Register;
public class OfflineAttenderRegisterItem extends Register {
public class OfflineAttenderRegisterItem extends OfflineRegisterItem {
    private String attenderId;
    public String getAttenderId() {
        return attenderId;
    }
    public void setAttenderId(String attenderId) {
        this.attenderId = attenderId;
    }
}
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/OfflineRegisterItem.java
New file
@@ -0,0 +1,60 @@
package cn.com.basic.face.discern.query.item;
import java.io.File;
import cn.com.basic.face.discern.entity.Register;
import cn.com.basic.face.util.FileUtil;
public class OfflineRegisterItem extends Register{
    private File rawSurveillancePhotoFile;
    private File SurveillancePhotoFile;
    private File uploadCustomPhotoFile;
    private File idCardPhotoFile;
    public File getRawSurveillancePhotoFile() {
        return rawSurveillancePhotoFile;
    }
    public void setRawSurveillancePhotoFile(File rawSurveillancePhotoFile) {
        this.rawSurveillancePhotoFile = rawSurveillancePhotoFile;
    }
    public File getSurveillancePhotoFile() {
        return SurveillancePhotoFile;
    }
    public void setSurveillancePhotoFile(File surveillancePhotoFile) {
        SurveillancePhotoFile = surveillancePhotoFile;
    }
    public File getUploadCustomPhotoFile() {
        return uploadCustomPhotoFile;
    }
    public void setUploadCustomPhotoFile(File uploadCustomPhotoFile) {
        this.uploadCustomPhotoFile = uploadCustomPhotoFile;
    }
    public File getIdCardPhotoFile() {
        return idCardPhotoFile;
    }
    public void setIdCardPhotoFile(File idCardPhotoFile) {
        this.idCardPhotoFile = idCardPhotoFile;
    }
    public void loadFiles() {
        setRawSurveillancePhotoFile(FileUtil.getFile(getRawSurveillancePhotoPath()));
        setSurveillancePhotoFile(FileUtil.getFile(getSurveillancePhoto()));
        setUploadCustomPhotoFile(FileUtil.getFile(getUploadCustomPhoto()));
        setIdCardPhotoFile(FileUtil.getFile(getIdCardPhoto()));
    }
    public void deleteFiles() {
        FileUtil.deleteFile(getRawSurveillancePhotoPath());
        FileUtil.deleteFile(getSurveillancePhoto());
        FileUtil.deleteFile(getUploadCustomPhoto());
        FileUtil.deleteFile(getIdCardPhoto());
    }
}
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/OfflineVisitorRegisterItem.java
@@ -5,57 +5,7 @@
import cn.com.basic.face.discern.entity.Register;
import cn.com.basic.face.util.FileUtil;
public class OfflineVisitorRegisterItem extends Register {
public class OfflineVisitorRegisterItem extends OfflineRegisterItem {
    private File rawSurveillancePhotoFile;
    private File SurveillancePhotoFile;
    private File uploadCustomPhotoFile;
    private File idCardPhotoFile;
    public File getRawSurveillancePhotoFile() {
        return rawSurveillancePhotoFile;
    }
    public void setRawSurveillancePhotoFile(File rawSurveillancePhotoFile) {
        this.rawSurveillancePhotoFile = rawSurveillancePhotoFile;
    }
    public File getSurveillancePhotoFile() {
        return SurveillancePhotoFile;
    }
    public void setSurveillancePhotoFile(File surveillancePhotoFile) {
        SurveillancePhotoFile = surveillancePhotoFile;
    }
    public File getUploadCustomPhotoFile() {
        return uploadCustomPhotoFile;
    }
    public void setUploadCustomPhotoFile(File uploadCustomPhotoFile) {
        this.uploadCustomPhotoFile = uploadCustomPhotoFile;
    }
    public File getIdCardPhotoFile() {
        return idCardPhotoFile;
    }
    public void setIdCardPhotoFile(File idCardPhotoFile) {
        this.idCardPhotoFile = idCardPhotoFile;
    }
    public void loadFiles() {
        setRawSurveillancePhotoFile(FileUtil.getFile(getRawSurveillancePhotoPath()));
        setSurveillancePhotoFile(FileUtil.getFile(getSurveillancePhoto()));
        setUploadCustomPhotoFile(FileUtil.getFile(getUploadCustomPhoto()));
        setIdCardPhotoFile(FileUtil.getFile(getIdCardPhoto()));
    }
    public void deleteFiles() {
        FileUtil.deleteFile(getRawSurveillancePhotoPath());
        FileUtil.deleteFile(getSurveillancePhoto());
        FileUtil.deleteFile(getUploadCustomPhoto());
        FileUtil.deleteFile(getIdCardPhoto());
    }
}
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/RegisterDao.java
@@ -268,7 +268,7 @@
    public void removeOfflineVisitorRegister(OfflineVisitorRegisterItem item) {
        try {
            String sql = "delete from register where visitor_id='"+item.getRegisterId()+"' AND a.is_synchron = 'N'";
            String sql = "delete from register where visitor_id='"+item.getRegisterId()+"' AND a.is_synchron = 'N' and visitor_or_attender='visitor'";
            SQLiteDatabase db = MainActivity.getInstance().db;
            db.execSQL(sql);
            item.deleteFiles();
@@ -298,4 +298,15 @@
        return hasMore;
    }
    public void removeOfflineAttenderRegister(OfflineAttenderRegisterItem item) {
        try {
            String sql = "delete from register where visitor_id='"+item.getRegisterId()+"' AND a.is_synchron = 'N' and visitor_or_attender='attender' ";
            SQLiteDatabase db = MainActivity.getInstance().db;
            db.execSQL(sql);
            item.deleteFiles();
        }
        catch (Exception e) {
            e.printStackTrace();
        }
    }
}
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sync/up/AttenderRegisterUpSync.java
@@ -1,10 +1,12 @@
package cn.com.basic.face.service.sync.up;
import android.graphics.Bitmap;
import android.widget.Toast;
import org.xutils.http.RequestParams;
import org.xutils.x;
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.FileWriter;
import java.util.List;
@@ -12,12 +14,16 @@
import cn.com.basic.face.base.BaseApplication;
import cn.com.basic.face.discern.common.BaseCommonCallBack;
import cn.com.basic.face.discern.common.SqliteSqlBean;
import cn.com.basic.face.discern.entity.Register;
import cn.com.basic.face.discern.query.item.OfflineAttenderRegisterItem;
import cn.com.basic.face.discern.query.item.OfflineVisitorRegisterItem;
import cn.com.basic.face.fragment.AttenderRegisterFragment;
import cn.com.basic.face.service.DictionaryMng;
import cn.com.basic.face.service.sqlite.CheckInDao;
import cn.com.basic.face.service.sqlite.RegisterDao;
import cn.com.basic.face.util.AppApi;
import cn.com.basic.face.util.FileUtil;
import cn.com.basic.face.util.NativeImg;
import cn.com.basic.face.util.SqliteSqlUtil;
public class AttenderRegisterUpSync extends BaseSync {
@@ -31,37 +37,33 @@
        try {
            final OfflineAttenderRegisterItem item = RegisterDao.getInstance().readOfflineAttenderRegister();
            RequestParams params = new RequestParams();
            params.addBodyParameter(Register.FieldNames.username, item.getUsername());
            params.addBodyParameter(Register.FieldNames.genderId, item.getGenderId());
            params.addBodyParameter(Register.FieldNames.identityTypeId, item.getIdentityTypeId());
            params.addBodyParameter(Register.FieldNames.postId, item.getPostId());
            params.addBodyParameter(Register.FieldNames.identifyNum, item.getIdentifyNum());
            params.addBodyParameter(Register.FieldNames.departmentId, item.getDepartmentId());
            params.addBodyParameter(Register.FieldNames.remark, item.getRemark());
            item.loadFiles();
            params.addBodyParameter("rawSurveillancePhoto", item.getRawSurveillancePhotoFile());
            params.addBodyParameter("surveillancePhoto", item.getSurveillancePhotoFile());
            params.addBodyParameter("uploadCustomPhoto", item.getUploadCustomPhotoFile());
            params.addBodyParameter("idCardPhoto", item.getIdCardPhotoFile());
            File path = BaseApplication.getInstance().getFilesDir();
            File rawSurveillancePhotoFile = new File(path, "rawSurveillancePhoto_attender");
            if (!rawSurveillancePhotoFile.exists()) {
                rawSurveillancePhotoFile.createNewFile();
            }
            File f0 = new File(path, "f0");
            if (!f0.exists()) {
                f0.createNewFile();
            }
            File surveillancePhotoFile = new File(path, "surveillancePhoto_attender");
            if (!surveillancePhotoFile.exists()) {
                surveillancePhotoFile.createNewFile();
            }
            File uploadCustomPhotoFile = new File(path, "uploadCustomPhoto_attender");
            if (!uploadCustomPhotoFile.exists()) {
                uploadCustomPhotoFile.createNewFile();
            }
            File idCardPhotoFile = new File(path, "idCardPhoto_attender");
            if (!idCardPhotoFile.exists()) {
                idCardPhotoFile.createNewFile();
            }
            FileWriter fw0 = new FileWriter(f0);
            fw0.write("test1");
            fw0.close();
            params.setUri(AppApi.BASE_URL +AppApi.ATTENDER_REGISTER_ADD);
            params.addBodyParameter("f0", f0);
            params.addBodyParameter("rawSurveillancePhoto", rawSurveillancePhotoFile);
            params.addBodyParameter("surveillancePhoto", surveillancePhotoFile);
            params.addBodyParameter("uploadCustomPhoto", uploadCustomPhotoFile);
            params.addBodyParameter("idCardPhoto", idCardPhotoFile);
            params.addBodyParameter("deviceCompanyId", BaseApplication.getInstance().getAndroidDevice().getCompanyId());
            x.http().post(params, new BaseCommonCallBack() {
                @Override
@@ -73,6 +75,7 @@
                            CheckInDao.getInstance().updateVisiteeId(item.getRegisterId(), sqliteSqlBean.getPrimaryKeyValue());
                        }
                    }
                    RegisterDao.getInstance().removeOfflineAttenderRegister(item);
                    sync();
                }
            });
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sync/up/VisitorRegisterUpSync.java
@@ -43,10 +43,10 @@
        item.loadFiles();
        params.addBodyParameter("rawSurveillancePhoto", item.getRawSurveillancePhotoPath());
        params.addBodyParameter("surveillancePhoto", item.getSurveillancePhoto());
        params.addBodyParameter("uploadCustomPhoto", item.getUploadCustomPhoto());
        params.addBodyParameter("idCardPhoto", item.getIdCardPhoto());
        params.addBodyParameter("rawSurveillancePhoto", item.getRawSurveillancePhotoFile());
        params.addBodyParameter("surveillancePhoto", item.getSurveillancePhotoFile());
        params.addBodyParameter("uploadCustomPhoto", item.getUploadCustomPhotoFile());
        params.addBodyParameter("idCardPhoto", item.getIdCardPhotoFile());
        params.addBodyParameter("deviceCompanyId", BaseApplication.getInstance().getAndroidDevice().getCompanyId());
        try {
            File path = BaseApplication.getInstance().getFilesDir();