xuxiuxi
2017-07-26 57de3dd4c7b2e0a7be1bcb4de49eb2046921b7ff


git-svn-id: http://192.168.1.226/svn/proxy@921 454eff88-639b-444f-9e54-f578c98de674
1 文件已复制
1 文件已重命名
14个文件已修改
124 ■■■■■ 已修改文件
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/DeviceMng.java 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sync/SyncDownThread.java 35 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sync/SyncUpThread.java 43 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sync/down/AttendanceDownSync.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sync/down/BaseDownSync.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sync/down/CompanyDownSync.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sync/down/DepartmentDownSync.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sync/down/DeviceDownSync.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sync/down/DictionaryDownSync.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sync/down/EmployeeDownSync.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sync/down/PhoneCallDownSync.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sync/down/PostDownSync.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sync/down/RegisterDownSync.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sync/down/VisitDetailDownSync.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sync/down/VisitDownSync.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sync/up/BaseSync.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/DeviceMng.java
@@ -9,6 +9,7 @@
import cn.com.basic.face.discern.common.CommonVariables;
import cn.com.basic.face.fragment.DeviceFragment;
import cn.com.basic.face.service.sqlite.DeviceDao;
import cn.com.basic.face.service.sync.SyncDownThread;
import cn.com.basic.face.util.AppApi;
import org.xutils.http.RequestParams;
@@ -20,12 +21,13 @@
import cn.com.basic.face.discern.common.BaseCommonCallBack;
import cn.com.basic.face.discern.entity.Device;
import cn.com.basic.face.util.SharedPreferencesUtils;
import cn.com.basic.face.service.sync.SyncUpAndDownThread;
import cn.com.basic.face.service.sync.SyncUpThread;
public class DeviceMng {
    public static DeviceMng instance = new DeviceMng();
    private SyncUpAndDownThread syncUpAndDownThread = null;
    private SyncUpThread syncUpThread = null;
    private SyncDownThread syncDownThread = null;
    public static String authorationId = "101";
@@ -147,10 +149,14 @@
                }
            });
            synchronized (this) {
                if (syncUpAndDownThread == null) {
                    syncUpAndDownThread = new SyncUpAndDownThread();
                syncUpAndDownThread.start();
            }
                if (syncUpThread == null) {
                    syncUpThread = new SyncUpThread();
                    syncUpThread.start();
                }
                if (syncDownThread == null) {
                    syncDownThread = new SyncDownThread();
                    syncDownThread.start();
                }
            }
        } else {
            Toast.makeText(BaseApplication.getInstance(), "数据库中找不到该设备", Toast.LENGTH_SHORT).show();
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sync/SyncDownThread.java
File was renamed from VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sync/SyncUpAndDownThread.java
@@ -3,7 +3,6 @@
import java.util.Date;
import cn.com.basic.face.base.BaseApplication;
import cn.com.basic.face.service.InternetAccessThread.InternetAccess;
import cn.com.basic.face.service.sync.down.AttendanceDownSync;
import cn.com.basic.face.service.sync.down.CompanyDownSync;
import cn.com.basic.face.service.sync.down.DepartmentDownSync;
@@ -24,32 +23,14 @@
import cn.com.basic.face.service.sync.up.OfflineSurveillanceUpSync;
import cn.com.basic.face.service.sync.up.VisitorRegisterUpSync;
public class SyncUpAndDownThread extends Thread {
public class SyncDownThread extends Thread {
    public boolean isThisTimeSyncComplete = false;
    BaseSync firstDownSync;
    BaseSync firstSync;
    public BaseSync buildSyncChain() {
        //up
        firstSync = DictionaryUpSync.getInstance();
        DeviceUpSync deviceUpSync = DeviceUpSync.getInstance();
        CompanyUpSync companyUpSync = CompanyUpSync.getInstance();
        VisitorRegisterUpSync visitorRegisterUpSync = VisitorRegisterUpSync.getInstance();
        AttenderRegisterUpSync attenderRegisterUpSync = AttenderRegisterUpSync.getInstance();
        OfflineSurveillanceUpSync offlineSurveillanceUpSync = OfflineSurveillanceUpSync.getInstance();
        CheckInUpSync checkInUpSync = CheckInUpSync.getInstance();
        firstSync.setNext(companyUpSync);
        companyUpSync.setNext(deviceUpSync);
        deviceUpSync.setNext(visitorRegisterUpSync);
        visitorRegisterUpSync.setNext(attenderRegisterUpSync);
        attenderRegisterUpSync.setNext(checkInUpSync);
        checkInUpSync.setNext(offlineSurveillanceUpSync);
    public void buildSyncChain() {
        // down
        AttendanceDownSync attendanceDownSync = AttendanceDownSync.getInstance();
        firstDownSync = AttendanceDownSync.getInstance();
        CompanyDownSync companyDownSync = CompanyDownSync.getInstance();
        DepartmentDownSync departmentDownSync = DepartmentDownSync.getInstance();
        DeviceDownSync deviceDownSync = DeviceDownSync.getInstance();
@@ -61,8 +42,7 @@
        VisitDetailDownSync visitDetailDownSync = VisitDetailDownSync.getInstance();
        VisitDownSync visitDownSync = VisitDownSync.getInstance();
        offlineSurveillanceUpSync.setNext(attendanceDownSync);
        attendanceDownSync.setNext(companyDownSync);
        firstDownSync.setNext(companyDownSync);
        companyDownSync.setNext(departmentDownSync);
        departmentDownSync.setNext(deviceDownSync);
        deviceDownSync.setNext(dictionaryDownSync);
@@ -73,7 +53,6 @@
        registerDownSync.setNext(visitDetailDownSync);
        visitDetailDownSync.setNext(visitDownSync);
        return firstSync;
    }
@@ -88,8 +67,8 @@
                double minutes = (now.getTime() - lastTime.getTime())*1.0 / 1000 / 60;
                if (minutes >= 0.3) {
                    if (BaseApplication.getInstance().networkAvailable()) {
                        firstSync.setAllSyncComplete(false);
                        firstSync.sync();
                        firstDownSync.setAllSyncComplete(false);
                        firstDownSync.sync();
                        lastTime = now;
                    }
                } else {
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sync/SyncUpThread.java
copy from VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sync/SyncUpAndDownThread.java copy to VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sync/SyncUpThread.java
File was copied from VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sync/SyncUpAndDownThread.java
@@ -3,7 +3,6 @@
import java.util.Date;
import cn.com.basic.face.base.BaseApplication;
import cn.com.basic.face.service.InternetAccessThread.InternetAccess;
import cn.com.basic.face.service.sync.down.AttendanceDownSync;
import cn.com.basic.face.service.sync.down.CompanyDownSync;
import cn.com.basic.face.service.sync.down.DepartmentDownSync;
@@ -24,16 +23,14 @@
import cn.com.basic.face.service.sync.up.OfflineSurveillanceUpSync;
import cn.com.basic.face.service.sync.up.VisitorRegisterUpSync;
public class SyncUpAndDownThread extends Thread {
public class SyncUpThread extends Thread {
    public boolean isThisTimeSyncComplete = false;
    BaseSync firstUpSync;
    BaseSync firstSync;
    public BaseSync buildSyncChain() {
    public void buildSyncChain() {
        //up
        firstSync = DictionaryUpSync.getInstance();
        firstUpSync = DictionaryUpSync.getInstance();
        DeviceUpSync deviceUpSync = DeviceUpSync.getInstance();
        CompanyUpSync companyUpSync = CompanyUpSync.getInstance();
        VisitorRegisterUpSync visitorRegisterUpSync = VisitorRegisterUpSync.getInstance();
@@ -41,39 +38,13 @@
        OfflineSurveillanceUpSync offlineSurveillanceUpSync = OfflineSurveillanceUpSync.getInstance();
        CheckInUpSync checkInUpSync = CheckInUpSync.getInstance();
        firstSync.setNext(companyUpSync);
        firstUpSync.setNext(companyUpSync);
        companyUpSync.setNext(deviceUpSync);
        deviceUpSync.setNext(visitorRegisterUpSync);
        visitorRegisterUpSync.setNext(attenderRegisterUpSync);
        attenderRegisterUpSync.setNext(checkInUpSync);
        checkInUpSync.setNext(offlineSurveillanceUpSync);
        // down
        AttendanceDownSync attendanceDownSync = AttendanceDownSync.getInstance();
        CompanyDownSync companyDownSync = CompanyDownSync.getInstance();
        DepartmentDownSync departmentDownSync = DepartmentDownSync.getInstance();
        DeviceDownSync deviceDownSync = DeviceDownSync.getInstance();
        DictionaryDownSync dictionaryDownSync = DictionaryDownSync.getInstance();
        EmployeeDownSync employeeDownSync = EmployeeDownSync.getInstance();
        PhoneCallDownSync phoneCallDownSync = PhoneCallDownSync.getInstance();
        PostDownSync postDownSync = PostDownSync.getInstance();
        RegisterDownSync registerDownSync = RegisterDownSync.getInstance();
        VisitDetailDownSync visitDetailDownSync = VisitDetailDownSync.getInstance();
        VisitDownSync visitDownSync = VisitDownSync.getInstance();
        offlineSurveillanceUpSync.setNext(attendanceDownSync);
        attendanceDownSync.setNext(companyDownSync);
        companyDownSync.setNext(departmentDownSync);
        departmentDownSync.setNext(deviceDownSync);
        deviceDownSync.setNext(dictionaryDownSync);
        dictionaryDownSync.setNext(employeeDownSync);
        employeeDownSync.setNext(phoneCallDownSync);
        phoneCallDownSync.setNext(postDownSync);
        postDownSync.setNext(registerDownSync);
        registerDownSync.setNext(visitDetailDownSync);
        visitDetailDownSync.setNext(visitDownSync);
        return firstSync;
    }
@@ -88,8 +59,8 @@
                double minutes = (now.getTime() - lastTime.getTime())*1.0 / 1000 / 60;
                if (minutes >= 0.3) {
                    if (BaseApplication.getInstance().networkAvailable()) {
                        firstSync.setAllSyncComplete(false);
                        firstSync.sync();
                        firstUpSync.setAllSyncComplete(false);
                        firstUpSync.sync();
                        lastTime = now;
                    }
                } else {
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sync/down/AttendanceDownSync.java
@@ -19,7 +19,7 @@
            RequestParams params = DataDownSyn.getParams("attendance");
            x.http().post(params, new BaseCommonCallBack() {
                public void success() {
                    handleSynDate(resultBean);
                    handleSynDate(resultBean,"attendance");
                    SqliteSqlUtil.insert(getExtraList(SqliteSqlBean.class));
                    syncNext();
                }
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sync/down/BaseDownSync.java
@@ -20,14 +20,14 @@
    }
    public void syncNext() {
        System.out.println("sync."+this.getClass().getName()+" 正在同步");
        System.out.println("sync."+this.getClass().getName()+" 正在向下同步");
        setSyncComplete(true);
        if (getNext() != null) {
            getNext().sync();
        }
    }
    public void handleSynDate(ResultBean rb){
    public void handleSynDate(ResultBean rb,String tableName){
        Long time=(Long)rb.getData();
        SimpleDateFormat format =  new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
        String synTime = format.format(time);
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sync/down/CompanyDownSync.java
@@ -20,7 +20,7 @@
            RequestParams params = DataDownSyn.getParams("company");
            x.http().post(params, new BaseCommonCallBack() {
                public void success() {
                    handleSynDate(resultBean);
                    handleSynDate(resultBean,"company");
                    SqliteSqlUtil.insert(getExtraList(SqliteSqlBean.class));
                    syncNext();
                }
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sync/down/DepartmentDownSync.java
@@ -20,7 +20,7 @@
            RequestParams params = DataDownSyn.getParams("department");
            x.http().post(params, new BaseCommonCallBack() {
                public void success() {
                    handleSynDate(resultBean);
                    handleSynDate(resultBean,"department");
                    SqliteSqlUtil.insert(getExtraList(SqliteSqlBean.class));
                    syncNext();
                }
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sync/down/DeviceDownSync.java
@@ -20,7 +20,7 @@
            RequestParams params = DataDownSyn.getParams("device");
            x.http().post(params, new BaseCommonCallBack() {
                public void success() {
                    handleSynDate(resultBean);
                    handleSynDate(resultBean,"device");
                    SqliteSqlUtil.insert(getExtraList(SqliteSqlBean.class));
                    syncNext();
                }
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sync/down/DictionaryDownSync.java
@@ -20,7 +20,7 @@
            RequestParams params = DataDownSyn.getParams("dictionary");
            x.http().post(params, new BaseCommonCallBack() {
                public void success() {
                    handleSynDate(resultBean);
                    handleSynDate(resultBean,"dictionary");
                    SqliteSqlUtil.insert(getExtraList(SqliteSqlBean.class));
                    syncNext();
                }
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sync/down/EmployeeDownSync.java
@@ -20,7 +20,7 @@
            RequestParams params = DataDownSyn.getParams("employee");
            x.http().post(params, new BaseCommonCallBack() {
                public void success() {
                    handleSynDate(resultBean);
                    handleSynDate(resultBean,"employee");
                    SqliteSqlUtil.insert(getExtraList(SqliteSqlBean.class));
                    syncNext();
                }
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sync/down/PhoneCallDownSync.java
@@ -20,7 +20,7 @@
            RequestParams params = DataDownSyn.getParams("phone_call");
            x.http().post(params, new BaseCommonCallBack() {
                public void success() {
                    handleSynDate(resultBean);
                    handleSynDate(resultBean,"phone_call");
                    SqliteSqlUtil.insert(getExtraList(SqliteSqlBean.class));
                    syncNext();
                }
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sync/down/PostDownSync.java
@@ -20,7 +20,7 @@
            RequestParams params = DataDownSyn.getParams("post");
            x.http().post(params, new BaseCommonCallBack() {
                public void success() {
                    handleSynDate(resultBean);
                    handleSynDate(resultBean,"post");
                    SqliteSqlUtil.insert(getExtraList(SqliteSqlBean.class));
                    syncNext();
                }
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sync/down/RegisterDownSync.java
@@ -20,7 +20,7 @@
            RequestParams params = DataDownSyn.getParams("register");
            x.http().post(params, new BaseCommonCallBack() {
                public void success() {
                    handleSynDate(resultBean);
                    handleSynDate(resultBean,"register");
                    SqliteSqlUtil.insert(getExtraList(SqliteSqlBean.class));
                    syncNext();
                }
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sync/down/VisitDetailDownSync.java
@@ -20,7 +20,7 @@
            RequestParams params = DataDownSyn.getParams("visit_detail");
            x.http().post(params, new BaseCommonCallBack() {
                public void success() {
                    handleSynDate(resultBean);
                    handleSynDate(resultBean,"visit_detail");
                    SqliteSqlUtil.insert(getExtraList(SqliteSqlBean.class));
                    syncNext();
                }
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sync/down/VisitDownSync.java
@@ -20,7 +20,7 @@
            RequestParams params = DataDownSyn.getParams("visit");
            x.http().post(params, new BaseCommonCallBack() {
                public void success() {
                    handleSynDate(resultBean);
                    handleSynDate(resultBean,"visit");
                    SqliteSqlUtil.insert(getExtraList(SqliteSqlBean.class));
                    syncNext();
                }
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sync/up/BaseSync.java
@@ -14,7 +14,7 @@
    }
    public void sync() {
        System.out.println("sync."+this.getClass().getName()+" 正在同步");
        System.out.println("sync."+this.getClass().getName()+" 正在向上同步");
        if (hasMore()) {
            syncComplete = false;
            doSync();