xuxiuxi
2017-07-28 e914b1710eced9226539d86b72c92a02f8939ccb


git-svn-id: http://192.168.1.226/svn/proxy@951 454eff88-639b-444f-9e54-f578c98de674
7个文件已修改
65 ■■■■■ 已修改文件
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/AttenderRegisterFragment.java 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/VisitorRegisterFragment.java 8 ●●●● 补丁 | 查看 | 原始文档 | 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/sqlite/SurveillanceDao.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/VisitDao.java 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sync/up/RegisterUpSync.java 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sync/up/VisitUpSync.java 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/AttenderRegisterFragment.java
@@ -247,7 +247,7 @@
            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
            offlineAttenderRegisterItem.setCreateTime(sdf.format(new Date()));
            String rawSurveillancePhotoPath = UUID.randomUUID().toString()+".bmp";
            String rawSurveillancePhotoPath = UUID.randomUUID().toString()+"";
            byte[] rawSurveillancePhotoBytes = new byte[]{};
            if (surveillanceQueryItem_selectPhoto != null) {
@@ -265,7 +265,7 @@
            FileUtil.writeToFile(rawSurveillancePhotoPath, rawSurveillancePhotoBytes);
            offlineAttenderRegisterItem.setRawSurveillancePhotoPath(rawSurveillancePhotoPath);
            String surveillancePhotoPath = UUID.randomUUID().toString()+".bmp";
            String surveillancePhotoPath = UUID.randomUUID().toString()+"";
            byte[] surveillancePhotoBytes = new byte[]{};
            if (fragment_attender_register_surveillance_photo_img != null) {
                ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
@@ -275,7 +275,7 @@
            FileUtil.writeToFile(surveillancePhotoPath, surveillancePhotoBytes);
            offlineAttenderRegisterItem.setSurveillancePhoto(surveillancePhotoPath);
            String uploadCustomPhotoPath = UUID.randomUUID().toString()+".bmp";
            String uploadCustomPhotoPath = UUID.randomUUID().toString()+"";
            byte[] uploadCustomPhotoBytes = new byte[]{};
            if (fragment_attender_register_upload_custom_photo_img != null) {
                ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
@@ -285,7 +285,7 @@
            FileUtil.writeToFile(uploadCustomPhotoPath, uploadCustomPhotoBytes);
            offlineAttenderRegisterItem.setUploadCustomPhoto(uploadCustomPhotoPath);
            String idCardPhotoPath = UUID.randomUUID().toString()+".bmp";
            String idCardPhotoPath = UUID.randomUUID().toString()+"";
            byte[] idCardPhotoBytes = new byte[]{};
            if (fragment_attender_register_id_card_photo_img != null) {
                ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/VisitorRegisterFragment.java
@@ -241,7 +241,7 @@
            offlineVisitorRegisterItem.setBirthday(fragment_visitor_register_birthday.getValue());
            offlineVisitorRegisterItem.setRemark(fragment_visitor_register_remark.getValue());
            String rawSurveillancePhotoPath = UUID.randomUUID().toString()+".bmp";
            String rawSurveillancePhotoPath = UUID.randomUUID().toString()+"";
            byte[] rawSurveillancePhotoBytes = new byte[]{};
            if (surveillanceQueryItem_selectPhoto != null) {
@@ -259,7 +259,7 @@
            FileUtil.writeToFile(rawSurveillancePhotoPath, rawSurveillancePhotoBytes);
            offlineVisitorRegisterItem.setRawSurveillancePhotoPath(rawSurveillancePhotoPath);
            String surveillancePhotoPath = UUID.randomUUID().toString()+".bmp";
            String surveillancePhotoPath = UUID.randomUUID().toString()+"";
            byte[] surveillancePhotoBytes = new byte[]{};
            if (fragment_visitor_register_surveillance_photo_img != null) {
                ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
@@ -269,7 +269,7 @@
            FileUtil.writeToFile(surveillancePhotoPath, surveillancePhotoBytes);
            offlineVisitorRegisterItem.setSurveillancePhoto(surveillancePhotoPath);
            String uploadCustomPhotoPath = UUID.randomUUID().toString()+".bmp";
            String uploadCustomPhotoPath = UUID.randomUUID().toString()+"";
            byte[] uploadCustomPhotoBytes = new byte[]{};
            if (fragment_visitor_register_upload_custom_photo_img != null) {
                ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
@@ -279,7 +279,7 @@
            FileUtil.writeToFile(uploadCustomPhotoPath, uploadCustomPhotoBytes);
            offlineVisitorRegisterItem.setUploadCustomPhoto(uploadCustomPhotoPath);
            String idCardPhotoPath = UUID.randomUUID().toString()+".bmp";
            String idCardPhotoPath = UUID.randomUUID().toString()+"";
            byte[] idCardPhotoBytes = new byte[]{};
            if (fragment_visitor_register_id_card_photo_img != null) {
                ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/RegisterDao.java
@@ -8,6 +8,7 @@
import java.util.List;
import cn.com.basic.face.base.MainActivity;
import cn.com.basic.face.discern.common.CommonVariables;
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;
@@ -314,9 +315,9 @@
    public List<Register>  getRegisterList(String deviceCompanyId){
        List<Register> list=new ArrayList<Register>();
        Register result=null;
        String sql="select * from register where is_synchron='N' and device_company_id="+Integer.parseInt(deviceCompanyId);
        String sql="select * from register where is_synchron='N' and device_company_id="+Integer.parseInt(deviceCompanyId) + " limit 0, 20 ";
        Cursor c =MainActivity.getInstance().db.rawQuery(sql,new String[]{});
        if(c.moveToFirst()){
        while(c.moveToNext()){
            result=new Register();
            result.setCreateTime(c.getString(c.getColumnIndex("create_time")));
            result.setIsValid(c.getString(c.getColumnIndex("is_valid")));
@@ -358,9 +359,11 @@
    }
    //删除已上传给你服务器的数据
    public void delRegiterList(){
        String sql="delete from register where is_synchron='N'";
        MainActivity.getInstance().db.execSQL(sql);
    public void delRegiterList(List<Register> list){
        for (Register item : list) {
            String sql="delete from register where is_synchron='N' and register_id='"+item.getRegisterId()+"'";
            MainActivity.getInstance().db.execSQL(sql);
        }
    }
    //获取未同步数据总数
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/SurveillanceDao.java
@@ -109,8 +109,8 @@
            result=new OfflineSurveillance();
            result.setDeviceCompanyId(deviceCompanyId);
            result.setDeviceId(deviceId);
            result.setCamera_in_or_out(c.getString(c.getColumnIndex("camera_in_or_out")));
            result.setCreate_time(c.getString(c.getColumnIndex("create_time")));
            result.setCameraInOrOut(c.getString(c.getColumnIndex("camera_in_or_out")));
            result.setCreateTime(c.getString(c.getColumnIndex("create_time")));
            result.setRawDataPath(c.getString(c.getColumnIndex("raw_data_path")));
            result.setSurveillanceId(c.getString(c.getColumnIndex("surveillance_id")));
            list.add(result);
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/VisitDao.java
@@ -105,9 +105,9 @@
    public List<Visit>  getVisitList(String deviceCompanyId) {
        List<Visit> list=new ArrayList<Visit>();
        Visit visit=null;
        String sql="select * from visit where is_synchron='N' and device_company_id="+Integer.parseInt(deviceCompanyId);
        String sql="select * from visit where is_synchron='N' and device_company_id="+Integer.parseInt(deviceCompanyId) + " limit 0, 50";
        Cursor c =MainActivity.getInstance().db.rawQuery(sql,new String[]{});
        if(c.moveToFirst()){
        while (c.moveToNext()){
            visit=new Visit();
            visit.setVisitId(c.getString(c.getColumnIndex("visit_id")));
            visit.setVisitReasonId(c.getString(c.getColumnIndex("visit_reason_id")));
@@ -127,15 +127,17 @@
            visit.setIsValid(c.getString(c.getColumnIndex("is_valid")));
            visit.setCreateTime(c.getString(c.getColumnIndex("create_time")));
            visit.setVisitReason(c.getString(c.getColumnIndex("visit_reason")));
            list.add(visit);
        }
          return  list;
        return  list;
    }
    //删除已上传给你服务器的数据
    public void delVisitList(){
        String sql="delete from visit where is_synchron='N'";
        MainActivity.getInstance().db.execSQL(sql);
    public void delVisitList(List<Visit> list){
        for (Visit item : list) {
            String sql="delete from visit where is_synchron='N' where visit_id='"+item.getVisitId()+"'";
            MainActivity.getInstance().db.execSQL(sql);
        }
    }
    //获取未同步数据总数
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sync/up/RegisterUpSync.java
@@ -5,8 +5,11 @@
import org.xutils.http.RequestParams;
import org.xutils.x;
import java.util.List;
import cn.com.basic.face.base.BaseApplication;
import cn.com.basic.face.discern.common.BaseCommonCallBack;
import cn.com.basic.face.discern.entity.Register;
import cn.com.basic.face.service.sqlite.RegisterDao;
import cn.com.basic.face.util.AppApi;
@@ -31,11 +34,12 @@
            final String tableName = "register";
            RequestParams params = new RequestParams(AppApi.BASE_URL + AppApi.UP_SYNCHRON);
            params.addBodyParameter("tableName", tableName);
            params.addBodyParameter("data", JSONArray.toJSONString( RegisterDao.getInstance().getRegisterList(BaseApplication.getInstance().getAndroidDevice().getCompanyId())));
            final List<Register> list = RegisterDao.getInstance().getRegisterList(BaseApplication.getInstance().getAndroidDevice().getCompanyId());
            params.addBodyParameter("data", JSONArray.toJSONString(list));
            params.addBodyParameter("deviceCompanyId",BaseApplication.getInstance().getAndroidDevice().getCompanyId());
            x.http().post(params, new BaseCommonCallBack() {
                public void success() {
                    RegisterDao.getInstance().delRegiterList();
                    RegisterDao.getInstance().delRegiterList(list);
                    sync();
                }
            });
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sync/up/VisitUpSync.java
@@ -5,8 +5,11 @@
import org.xutils.http.RequestParams;
import org.xutils.x;
import java.util.List;
import cn.com.basic.face.base.BaseApplication;
import cn.com.basic.face.discern.common.BaseCommonCallBack;
import cn.com.basic.face.discern.entity.Visit;
import cn.com.basic.face.service.sqlite.VisitDao;
import cn.com.basic.face.util.AppApi;
@@ -30,11 +33,12 @@
            final String tableName = "visit";
            RequestParams params = new RequestParams(AppApi.BASE_URL + AppApi.UP_SYNCHRON);
            params.addBodyParameter("tableName", tableName);
            params.addBodyParameter("data", JSONArray.toJSONString(VisitDao.getInstance().getVisitList(BaseApplication.getInstance().getAndroidDevice().getCompanyId())));
            final List<Visit> list = VisitDao.getInstance().getVisitList(BaseApplication.getInstance().getAndroidDevice().getCompanyId());
            params.addBodyParameter("data", JSONArray.toJSONString(list));
            params.addBodyParameter("deviceCompanyId",BaseApplication.getInstance().getAndroidDevice().getCompanyId());
            x.http().post(params, new BaseCommonCallBack() {
                public void success() {
                    VisitDao.getInstance().delVisitList();
                    VisitDao.getInstance().delVisitList(list);
                    sync();
                }
            });