From 5183ba3674454010561a9470bf4142dcbd916afe Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期二, 18 七月 2017 16:17:12 +0800
Subject: [PATCH] 

---
 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/AppApi.java                       |    2 
 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/AttendanceDao.java      |   11 ---
 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/base/MainActivity.java                 |    2 
 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/AttendanceMng.java             |   67 ++++++++++++----------
 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/RegisterMng.java               |   11 +++
 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/common/CommonVariables.java    |    2 
 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/AttenderRegisterFragment.java |    5 -
 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/VisitorRegisterFragment.java  |   23 ++++---
 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/TestDao.java            |   14 ++++
 9 files changed, 80 insertions(+), 57 deletions(-)

diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/base/MainActivity.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/base/MainActivity.java
index 0629e5e..d3d13ba 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/base/MainActivity.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/base/MainActivity.java
@@ -48,6 +48,7 @@
 import cn.com.basic.face.fragment.AttenderRegisterFragment;
 import cn.com.basic.face.fragment.SurveillanceFragment;
 import cn.com.basic.face.service.SurveillanceMng;
+import cn.com.basic.face.service.sqlite.TestDao;
 import cn.com.basic.face.util.FileUtil;
 import cn.com.basic.face.util.NativeImg;
 import cn.com.basic.face.util.TabNameUtil;
@@ -127,6 +128,7 @@
         }
         initDb();
         initSqlMap();
+        TestDao.getInstance().test();
     }
 
     public static MainActivity getInstance() {
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/common/CommonVariables.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/common/CommonVariables.java
index c53644b..d426348 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/common/CommonVariables.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/common/CommonVariables.java
@@ -112,7 +112,7 @@
 
     public static boolean FACE_SERVER = false;
     public static boolean ID_CARD = false;
-    public static boolean EMULATOR = true;
+    public static boolean EMULATOR = false;
 
     public static boolean androidOffline() {
         return true;
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/AttenderRegisterFragment.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/AttenderRegisterFragment.java
index 4b9ce56..11197a1 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/AttenderRegisterFragment.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/AttenderRegisterFragment.java
@@ -467,12 +467,12 @@
         }
     }
 
-    private boolean registerFragmentVisible = false;
+    public boolean attenderRegisterFragmentVisible = false;
 
     @Override
     public void setMenuVisibility(boolean menuVisible) {
         super.setMenuVisibility(menuVisible);
-        registerFragmentVisible = menuVisible;
+        attenderRegisterFragmentVisible = menuVisible;
     }
 
     @OnClick(R.id.fragment_visitor_register_to_visitor_register)
@@ -481,7 +481,6 @@
         fragment.getChildFragmentManager().popBackStackImmediate();
         CommonVariables.Register.VISITOR_REGISTER_SELECTED = true;
     }
-
 
     public void fragment_attender_register_post_click(View view) {
         new SelectDialog(fragment_attender_register_linear_layout, Constant.DialogSelectType.POST, new OkClickedListener() {
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/VisitorRegisterFragment.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/VisitorRegisterFragment.java
index 394949b..a37f4ef 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/VisitorRegisterFragment.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/VisitorRegisterFragment.java
@@ -343,21 +343,21 @@
 
         idCardHeadPath = "";
 
-        fragment_visitor_register_name.setValue("寰愪慨婧�"+Math.random());
-        fragment_visitor_register_phone.setValue("13691348767");
-        fragment_visitor_register_id_num.setValue("36041419292222222");
-        fragment_visitor_register_birthday.setValue("1985-08-12");
-        fragment_visitor_register_company.setValue("璐濇�濈");
-        fragment_visitor_register_remark.setValue("澶囨敞");
+        fragment_visitor_register_name.setValue("");
+        fragment_visitor_register_phone.setValue("");
+        fragment_visitor_register_id_num.setValue("");
+        fragment_visitor_register_birthday.setValue("");
+        fragment_visitor_register_company.setValue("");
+        fragment_visitor_register_remark.setValue("");
 
         fragment_visitor_register_name.setValue("");
         fragment_visitor_register_id_num.setValue("");
         fragment_visitor_register_birthday.setValue("");
 
-        fragment_visitor_register_gender.setValue("鐢�");
-        fragment_visitor_register_id_class.setValue("韬唤璇�");
-        fragment_visitor_register_country.setValue("涓浗");
-        fragment_visitor_register_visitor_class.setValue("鏅�氳瀹�");
+        fragment_visitor_register_gender.setValue("");
+        fragment_visitor_register_id_class.setValue("");
+        fragment_visitor_register_country.setValue("");
+        fragment_visitor_register_visitor_class.setValue("");
         fragment_visitor_register_surveillance_photo_img = null;
         fragment_visitor_register_upload_custom_photo_img = null;
         fragment_visitor_register_id_card_photo_img = null;
@@ -517,9 +517,12 @@
         }
     }
 
+    public boolean visitorRegisterFragmentVisible = false;
+
     @Override
     public void setMenuVisibility(boolean menuVisible) {
         super.setMenuVisibility(menuVisible);
+        visitorRegisterFragmentVisible = menuVisible;
     }
 
     @OnClick(R.id.fragment_visitor_register_to_attender_register)
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/AttendanceMng.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/AttendanceMng.java
index c26ba13..cee37bb 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/AttendanceMng.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/AttendanceMng.java
@@ -10,6 +10,7 @@
 import cn.com.basic.face.base.BaseApplication;
 import cn.com.basic.face.discern.common.BaseCommonCallBack;
 import cn.com.basic.face.discern.common.CommonVariables;
+import cn.com.basic.face.discern.common.ResultBean;
 import cn.com.basic.face.discern.query.condition.AttendanceDetailQueryCondition;
 import cn.com.basic.face.discern.query.condition.AttendanceQueryCondition;
 import cn.com.basic.face.discern.query.item.AttendanceDetailQueryItem;
@@ -30,39 +31,43 @@
         if (!BaseApplication.deviceAvailable) {
             return;
         }
-        RequestParams params = new RequestParams(AppApi.BASE_URL +AppApi.Query.ATTENDANCE_QUERY);
-        params.addBodyParameter(AttendanceQueryCondition.FieldNames.username, searchText);
-        params.addBodyParameter(CommonVariables.Page.PAGE_NUM, pageNum+"");
-        params.addBodyParameter(CommonVariables.Page.PAGE_SIZE, CommonVariables.Page.DEFAULT_PAGE_SIZE);
-        x.http().post(params, new BaseCommonCallBack() {
-            public void success() {
-                List<AttendanceQueryItem> list = getList(AttendanceQueryItem.class);
-                List itemList = new ArrayList();
-                int i = 0;
-                String previewDate = "";
-                if (append) {
-                    List prevList = AttendanceFragment.getInstance().get_fragment_attendance_left_list_view().getPrevList();
-                    if (prevList != null && prevList.size() > 1) {
-                        previewDate = DateUtil.yyyy_MM_dd_to_yyyy骞碝M鏈坉d鏃�(
-                                ((AttendanceQueryItem)prevList.get(prevList.size()-2)).getTime());
-                    }
-                }
-                for (AttendanceQueryItem item : list) {
-                    try {
-                        String yyyyMMdd = DateUtil.yyyy_MM_dd_to_yyyy骞碝M鏈坉d鏃�(item.getTime());
-                        if (!previewDate.equals(yyyyMMdd)) {
-                            itemList.add(yyyyMMdd);
-                            previewDate = yyyyMMdd;
+        if(BaseApplication.getInstance().networkNotAvailable()) {
+            ResultBean resultBean = AttendanceDao.getInstance().reloadLeftList(searchText, pageNum, append);
+        } else {
+            RequestParams params = new RequestParams(AppApi.BASE_URL + AppApi.Query.ATTENDANCE_QUERY);
+            params.addBodyParameter(AttendanceQueryCondition.FieldNames.username, searchText);
+            params.addBodyParameter(CommonVariables.Page.PAGE_NUM, pageNum + "");
+            params.addBodyParameter(CommonVariables.Page.PAGE_SIZE, CommonVariables.Page.DEFAULT_PAGE_SIZE);
+            x.http().post(params, new BaseCommonCallBack() {
+                public void success() {
+                    List<AttendanceQueryItem> list = getList(AttendanceQueryItem.class);
+                    List itemList = new ArrayList();
+                    int i = 0;
+                    String previewDate = "";
+                    if (append) {
+                        List prevList = AttendanceFragment.getInstance().get_fragment_attendance_left_list_view().getPrevList();
+                        if (prevList != null && prevList.size() > 1) {
+                            previewDate = DateUtil.yyyy_MM_dd_to_yyyy骞碝M鏈坉d鏃�(
+                                    ((AttendanceQueryItem) prevList.get(prevList.size() - 2)).getTime());
                         }
-                    } catch (Exception e) { }
-                    itemList.add(item);
-                    i++;
+                    }
+                    for (AttendanceQueryItem item : list) {
+                        try {
+                            String yyyyMMdd = DateUtil.yyyy_MM_dd_to_yyyy骞碝M鏈坉d鏃�(item.getTime());
+                            if (!previewDate.equals(yyyyMMdd)) {
+                                itemList.add(yyyyMMdd);
+                                previewDate = yyyyMMdd;
+                            }
+                        } catch (Exception e) {
+                        }
+                        itemList.add(item);
+                        i++;
+                    }
+                    addPageFooter(hasMorePages(), getPageNum(), itemList);
+                    AttendanceFragment.getInstance().get_fragment_attendance_left_list_view().show(itemList, append);
                 }
-                addPageFooter(hasMorePages(), getPageNum(), itemList);
-                AttendanceFragment.getInstance().get_fragment_attendance_left_list_view().show(itemList, append);
-            }
-        });
-
+            });
+        }
     }
 
     public void reloadAttendanceDetail(AttendanceQueryItem item) {
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/RegisterMng.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/RegisterMng.java
index 09acc7d..2fcd314 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/RegisterMng.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/RegisterMng.java
@@ -3,6 +3,7 @@
 import android.widget.Toast;
 
 import cn.com.basic.face.base.BaseApplication;
+import cn.com.basic.face.discern.common.CommonVariables;
 import cn.com.basic.face.fragment.AttenderRegisterFragment;
 import cn.com.basic.face.fragment.VisitorRegisterFragment;
 import cn.com.basic.face.util.AppApi;
@@ -109,7 +110,9 @@
             x.http().post(params, new BaseCommonCallBack() {
                 @Override
                 public void success() {
-                    if (!VisitorRegisterFragment.getInstance().isVisible()) {
+                    if (!VisitorRegisterFragment.getInstance().visitorRegisterFragmentVisible
+                            && !AttenderRegisterFragment.getInstance().attenderRegisterFragmentVisible
+                            ) {
                         return;
                     }
                     List<Double> percents = resultBean.getListBeanOfType(Double.class);
@@ -117,7 +120,11 @@
                         double percent = percents.get(0);
                         if (percent >= 70) {
                             Toast.makeText(BaseApplication.getInstance(),"璁よ瘉閫氳繃", Toast.LENGTH_SHORT).show();
-                            VisitorRegisterFragment.getInstance().fillFormWithIdCard(idCard);
+                            if (CommonVariables.Register.VISITOR_REGISTER_SELECTED) {
+                                VisitorRegisterFragment.getInstance().fillFormWithIdCard(idCard);
+                            } else {
+                                AttenderRegisterFragment.getInstance().fillFormWithIdCard(idCard);
+                            }
                             return;
                         }
                         System.out.println("percent="+percent);
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/AttendanceDao.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/AttendanceDao.java
index 8a0cab1..f6c7ebb 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/AttendanceDao.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/AttendanceDao.java
@@ -60,16 +60,9 @@
     public ResultBean reloadLeftList(String searchText, final int pageNum, final boolean append) {
         ResultBean resultBean = new ResultBean();
         try {
-            resultBean.setData(new ArrayList<AttendanceQueryItem>());
-            //list = Config.sqlMap.queryForList("selectPersons");
-            //Config.sqlMap.getDb();
-            //result
-            SQLiteDatabase db = Config.sqlMap.getDb();
-            Cursor c = db.rawQuery("select", new String[]{"a"});
-            db.beginTransaction();
-            db.endTransaction();
+            List<AttendanceQueryItem> list = Config.sqlMap.queryForList("selectPersons");
+            resultBean.setData(list);
         } catch (Exception e) {
-
             e.printStackTrace();
         }
         return resultBean;
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/TestDao.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/TestDao.java
new file mode 100644
index 0000000..ec490fb
--- /dev/null
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/TestDao.java
@@ -0,0 +1,14 @@
+package cn.com.basic.face.service.sqlite;
+
+public class TestDao {
+
+    public static TestDao instance = new TestDao();
+    public static TestDao getInstance() {
+        return instance;
+    }
+
+    public static void test() {
+
+    }
+
+}
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/AppApi.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/AppApi.java
index b11fdee..e6bb6f3 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/AppApi.java
+++ b/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.48: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.35:8080/face/";
+//	public final static String BASE_URL = "http://192.168.1.40:8080/face/";
 
 	//璁垮娉ㄥ唽娣诲姞
 	public static final String REGISTER_ADD = "Register/o_add.do";

--
Gitblit v1.8.0