xuxiuxi
2017-07-23 7746e77099555a259f905ece694a2d82306aac59


git-svn-id: http://192.168.1.226/svn/proxy@819 454eff88-639b-444f-9e54-f578c98de674
5个文件已修改
35 ■■■■ 已修改文件
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/common/ResultBean.java 19 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/PhoneCallMng.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/VisitDao.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/AppApi.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/UnknownSurveillanceQueryItemUtil.java 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/common/ResultBean.java
@@ -1,11 +1,14 @@
package cn.com.basic.face.discern.common;
import java.util.ArrayList;
import java.util.List;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import org.xutils.http.annotation.HttpResponse;
import cn.com.basic.face.base.BaseApplication;
@HttpResponse(parser = JsonResponseParser.class)
public class ResultBean {
@@ -49,11 +52,19 @@
    }
    public <T> List<T> getList(Class<T> requiredType) {
        if (data != null) {
            if (data instanceof JSONArray) {
                JSONArray jsonArray = (JSONArray) data;
                return JSON.parseArray(jsonArray.toJSONString(), requiredType);
        if (BaseApplication.getInstance().networkAvailable()) {
            if (data != null) {
                if (data instanceof JSONArray) {
                    JSONArray jsonArray = (JSONArray) data;
                    return JSON.parseArray(jsonArray.toJSONString(), requiredType);
                }
            }
        } else {
            List<T> list = (List<T>)getData();
            if (list == null) {
                list = new ArrayList<>();
            }
            return list;
        }
        return null;
    }
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/PhoneCallMng.java
@@ -51,7 +51,7 @@
                }
            });
        } else {
            findPhoneCallLeftListAfterReturn(PhoneCallDao.getInstance().findPhoneCallLeftList(searchText, pageNum), isSortByDept, append);
             findPhoneCallLeftListAfterReturn(PhoneCallDao.getInstance().findPhoneCallLeftList(searchText, pageNum), isSortByDept, append);
        }
    }
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/VisitDao.java
@@ -82,7 +82,7 @@
            }
            Integer total = null;
            while (c_count.moveToNext()) {
                total = c.getInt(c.getColumnIndex("count"));
                total = c.getInt(0);
            }
            resultBean.setTotalPages(getTotalPageSize(total));
            resultBean.setPageNum(pageNum);
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/AppApi.java
@@ -7,7 +7,7 @@
    public final static String IMAGE_URL_BASE = "http://192.168.1.49:8888/";
    //public final static String BASE_URL = "http://192.168.1.51/face/";
//    public final static String BASE_URL = "http://192.168.1.51:8333/face/";
    public final static String BASE_URL = "http://192.168.1.102:8080/face/";
    public final static String BASE_URL = "http://192.168.1.101:8080/face/";
    //访客注册添加
    public static final String REGISTER_ADD = "Register/o_add.do";
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/UnknownSurveillanceQueryItemUtil.java
@@ -4,6 +4,7 @@
import java.util.Date;
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.query.item.SurveillanceQueryItem;
import cn.com.basic.face.fragment.SurveillanceFragment;
@@ -35,8 +36,13 @@
            }
        }
        allItems.removeAll(itemsToRemove);
        SurveillanceFragment.getInstance().get_fragment_supervisory_bottom_visitor_list_view().show(UnknownSurveillanceQueryItemUtil.getInstance().getUnknownTwoRows());
        SurveillanceFragment.getInstance().get_fragment_supervisory_bottom_attendance_list_view().show(new ArrayList());
        MainActivity.getInstance().runOnUiThread(new Runnable() {
            @Override
            public void run() {
                SurveillanceFragment.getInstance().get_fragment_supervisory_bottom_visitor_list_view().show(UnknownSurveillanceQueryItemUtil.getInstance().getUnknownTwoRows());
                SurveillanceFragment.getInstance().get_fragment_supervisory_bottom_attendance_list_view().show(new ArrayList());
            }
        });
    }
    private List getUnknownTwoRows() {