xuxiuxi
2017-07-25 c6bba5994bbc7e6fdb1841fbc97f90800f9dce0d


git-svn-id: http://192.168.1.226/svn/proxy@892 454eff88-639b-444f-9e54-f578c98de674
2个文件已删除
6个文件已修改
239 ■■■■ 已修改文件
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/common/CommonVariables.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/DataSynchronService.java 109 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/DeviceMng.java 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sync/down/DataDownSyn.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sync/up/BaseSync.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sync/up/DataTableUpSync.java 95 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/AppApi.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/SyncUpAndDownThread.java 14 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/common/CommonVariables.java
@@ -113,7 +113,7 @@
    public static boolean FACE_SERVER = false;
    public static boolean ID_CARD = false;
    public static boolean EMULATOR = false;
    public static boolean EMULATOR = true;
    public static boolean androidOffline() {
        return true;
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/DataSynchronService.java
File was deleted
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/DeviceMng.java
@@ -21,9 +21,12 @@
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.util.SyncUpAndDownThread;
public class DeviceMng {
    public static DeviceMng instance = new DeviceMng();
    private SyncUpAndDownThread syncUpAndDownThread = null;
    public static String authorationId = "101";
@@ -141,6 +144,12 @@
                    }
                }
            });
            synchronized (this) {
                if (syncUpAndDownThread == null) {
                    syncUpAndDownThread = new SyncUpAndDownThread();
                syncUpAndDownThread.start();
            }
            }
        } else {
            Toast.makeText(BaseApplication.getInstance(), "数据库中找不到该设备", Toast.LENGTH_SHORT).show();
        }
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sync/down/DataDownSyn.java
@@ -10,7 +10,6 @@
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.service.DataSynchronService;
import cn.com.basic.face.service.sqlite.SynchronRecordDao;
import cn.com.basic.face.util.AppApi;
import cn.com.basic.face.util.SqliteSqlUtil;
@@ -25,9 +24,9 @@
public class DataDownSyn {
    public static DataSynchronService instance = new DataSynchronService();
    public static DataDownSyn instance = new DataDownSyn();
    public static DataSynchronService getInstance() {
    public static DataDownSyn getInstance() {
        return instance;
    }
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sync/up/BaseSync.java
@@ -14,6 +14,7 @@
    }
    public void sync() {
        System.out.println("sync."+this.getClass().getName()+" 正在同步");
        if (hasMore()) {
            syncComplete = false;
            doSync();
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sync/up/DataTableUpSync.java
File was deleted
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/AppApi.java
@@ -9,8 +9,8 @@
//    public final static String BASE_URL = "http://192.168.1.51:8333/face/";
    //public final static String BASE_URL = "http://192.168.1.101:8080/face/";
//    public final static String BASE_URL = "http://192.168.1.36:8080/face/";
    public final static String BASE_URL = "http://192.168.1.51:8333/face/";
//    public final static String BASE_URL = "http://192.168.1.81:8080/face/";
//    public final static String BASE_URL = "http://192.168.1.51:8333/face/";
    public final static String BASE_URL = "http://192.168.1.81:8080/face/";
//    public final static  String BASE_URL="http://192.168.1.160:8080/ssm/";
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/SyncUpAndDownThread.java
@@ -1,5 +1,7 @@
package cn.com.basic.face.util;
import java.util.Date;
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;
@@ -73,15 +75,21 @@
    }
    Date lastTime = new Date();
    @Override
    public void run() {
        firstSync = buildSyncChain();
        firstSync.setAllSyncComplete(false);
        firstSync.sync();
        while (true) {
            try {
                firstSync.setAllSyncComplete(false);
                if (firstSync.lastUpSyncComplete()) {
                Date now = new Date();
                double minutes = (now.getTime() - lastTime.getTime())*1.0 / 1000 / 60;
                if (minutes >= 5) {
                    firstSync.setAllSyncComplete(false);
                    firstSync.sync();
                    Thread.sleep(5 * 60 * 1000);
                    lastTime = now;
                } else {
                    Thread.sleep(10*1000);
                    return;