xuxiuxi
2017-07-23 e2b8f363dc6a670159b7b5d47cd9577a018505db


git-svn-id: http://192.168.1.226/svn/proxy@829 454eff88-639b-444f-9e54-f578c98de674
10个文件已修改
61 ■■■■ 已修改文件
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/base/MainActivity.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/VisitorRegisterFragment.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/SurveillanceQueryItemUtil.java 20 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/checkin/CheckInLeftInterviewee.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/checkin/CheckInLeftVisitor.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/phonecall/PhoneCallLeftListView.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/surveilance/SurveillanceBottomAttendanceListView.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/surveilance/SurveillanceBottomVisitorListView.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/surveilance/SurveillancePhotoSelectListView.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/visit/VisitLeftListView.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/base/MainActivity.java
@@ -512,7 +512,7 @@
    protected void onStop() {
        super.onStop();
        //Config.sqlMap.getDb().close();
        db.close();
//        db.close();
    }
}
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/VisitorRegisterFragment.java
@@ -177,7 +177,7 @@
            params.addBodyParameter(Register.FieldNames.countryId, DictionaryMng.getInstance().getId(fragment_visitor_register_country.getValue()));
            params.addBodyParameter(Register.FieldNames.visitorTypeId, DictionaryMng.getInstance().getId(visitor_type));
            params.addBodyParameter(Register.FieldNames.identifyNum, fragment_visitor_register_id_num.getValue());
            params.addBodyParameter(Register.FieldNames.companyId, company);
//            params.addBodyParameter(Register.FieldNames.companyId, null);
            params.addBodyParameter(Register.FieldNames.company, company);
            params.addBodyParameter(Register.FieldNames.birthday, fragment_visitor_register_birthday.getValue());
            params.addBodyParameter(Register.FieldNames.remark, fragment_visitor_register_remark.getValue());
@@ -231,7 +231,7 @@
            offlineVisitorRegisterItem.setCountryId(DictionaryMng.getInstance().getId(fragment_visitor_register_country.getValue()));
            offlineVisitorRegisterItem.setVisitorTypeId(DictionaryMng.getInstance().getId(visitor_type));
            offlineVisitorRegisterItem.setIdentifyNum(fragment_visitor_register_id_num.getValue());
            offlineVisitorRegisterItem.setCompanyId(company);
            offlineVisitorRegisterItem.setCompanyId(null);
            offlineVisitorRegisterItem.setCompany(company);
            offlineVisitorRegisterItem.setBirthday(fragment_visitor_register_birthday.getValue());
            offlineVisitorRegisterItem.setRemark(fragment_visitor_register_remark.getValue());
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/SurveillanceQueryItemUtil.java
@@ -176,16 +176,16 @@
    public void removeTimeoutItemAndShow() {
        List itemsToRemove = new ArrayList();
        for (SurveillanceQueryItem item : allItems) {
            if (item.getRegisterOrCheckIn() == CommonVariables.Surveillance.VISIT_REGISTER_ITEM_TYPE) {
                Date now = new Date();
                Date createTime = item.getCreateTime();
                double minutes = (now.getTime() - createTime.getTime())*1.0 / 1000 / 60;
                if (minutes >= 5) {
                    itemsToRemove.add(item);
                }
            }
        }
//        for (SurveillanceQueryItem item : allItems) {
//            if (item.getRegisterOrCheckIn() == CommonVariables.Surveillance.VISIT_REGISTER_ITEM_TYPE) {
//                Date now = new Date();
//                Date createTime = item.getCreateTime();
//                double minutes = (now.getTime() - createTime.getTime())*1.0 / 1000 / 60;
//                if (minutes >= 5) {
//                    itemsToRemove.add(item);
//                }
//            }
//        }
        allItems.removeAll(itemsToRemove);
        SurveillanceFragment.getInstance().get_fragment_supervisory_bottom_visitor_list_view().show(SurveillanceQueryItemUtil.getInstance().getVisitorTwoRows());
        SurveillanceFragment.getInstance().get_fragment_supervisory_bottom_attendance_list_view().show(SurveillanceQueryItemUtil.getInstance().getAttendanceTwoRows());
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/checkin/CheckInLeftInterviewee.java
@@ -17,8 +17,8 @@
public class CheckInLeftInterviewee extends EasyRecyclerView {
    private static CheckInFragment.CheckInLeftIntervieweeAdapter adapter = new CheckInFragment.CheckInLeftIntervieweeAdapter();
    private List list = new ArrayList();
    private Parcelable recyclerViewState;
    private static List list = new ArrayList();
    private static Parcelable recyclerViewState;
    public void setAdapter(Context context) {
        setAdapter(adapter);
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/checkin/CheckInLeftVisitor.java
@@ -17,8 +17,8 @@
public class CheckInLeftVisitor extends EasyRecyclerView {
    private static CheckInFragment.CheckInLeftVisitorAdapter adapter = new CheckInFragment.CheckInLeftVisitorAdapter();
    private List list = new ArrayList();
    private Parcelable recyclerViewState;
    private static List list = new ArrayList();
    private static Parcelable recyclerViewState;
    public void setAdapter(Context context) {
        setAdapter(adapter);
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/phonecall/PhoneCallLeftListView.java
@@ -15,7 +15,7 @@
public class PhoneCallLeftListView extends EasyRecyclerView {
    private static PhoneCallLeftAdapter adapter ;
    private Parcelable recyclerViewState;
    private static Parcelable recyclerViewState;
    private void initView() {
        adapter = new PhoneCallLeftAdapter();
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/surveilance/SurveillanceBottomAttendanceListView.java
@@ -20,7 +20,9 @@
public class SurveillanceBottomAttendanceListView extends EasyRecyclerView {
    private Parcelable recyclerViewState;
    public static SurveillanceFragment.SurveillanceBottomAttendanceListViewAdapter mAdapter;
    public static List list = new ArrayList();
    public static Parcelable recyclerViewState;
    private class SpaceItemDecoration extends ItemDecoration {
        @Override
@@ -43,9 +45,6 @@
        gridLayoutManager.setOrientation(LinearLayoutManager.HORIZONTAL);
        setLayoutManager(gridLayoutManager);
    }
    private SurveillanceFragment.SurveillanceBottomAttendanceListViewAdapter mAdapter;
    private List list = new ArrayList();
    public void setAdapter(Context context) {
        mAdapter = new SurveillanceFragment.SurveillanceBottomAttendanceListViewAdapter(context);
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/surveilance/SurveillanceBottomVisitorListView.java
@@ -20,7 +20,9 @@
public class SurveillanceBottomVisitorListView extends EasyRecyclerView {
    private Parcelable recyclerViewState;
    public static SurveillanceFragment.SurveillanceBottomVisitorListViewAdapter mAdapter;
    public static List list = new ArrayList();
    public static Parcelable recyclerViewState;
    private class SpaceItemDecoration extends RecyclerView.ItemDecoration {
        @Override
@@ -43,9 +45,6 @@
        gridLayoutManager.setOrientation(LinearLayoutManager.HORIZONTAL);
        setLayoutManager(gridLayoutManager);
    }
    private SurveillanceFragment.SurveillanceBottomVisitorListViewAdapter mAdapter;
    private List list = new ArrayList();
    public void setAdapter(Context context) {
        mAdapter = new SurveillanceFragment.SurveillanceBottomVisitorListViewAdapter(context);
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/surveilance/SurveillancePhotoSelectListView.java
@@ -21,7 +21,9 @@
public class SurveillancePhotoSelectListView extends EasyRecyclerView {
    private Parcelable recyclerViewState;
    public static Parcelable recyclerViewState;
    public static SurveillanceFragment.SurveillancePhotoSelectListViewAdapter mAdapter;
    public static List list = new ArrayList();
    private class SpaceItemDecoration extends ItemDecoration {
        @Override
@@ -44,9 +46,6 @@
        gridLayoutManager.setOrientation(LinearLayoutManager.HORIZONTAL);
        setLayoutManager(gridLayoutManager);
    }
    private SurveillanceFragment.SurveillancePhotoSelectListViewAdapter mAdapter;
    private List list = new ArrayList();
    public void setAdapter(Context context) {
        mAdapter = new SurveillanceFragment.SurveillancePhotoSelectListViewAdapter(context);
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/visit/VisitLeftListView.java
@@ -14,8 +14,8 @@
public class VisitLeftListView extends EasyRecyclerView {
    private static VisitFragment.VisitLeftAdapter adapter;
    private Parcelable recyclerViewState;
    public static VisitFragment.VisitLeftAdapter adapter;
    public static Parcelable recyclerViewState;
    private void initView() {
        adapter = new VisitFragment.VisitLeftAdapter();