From d999731ac1ba495dbfea06cbb14dcfd3a53bcd64 Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期六, 22 七月 2017 00:03:04 +0800
Subject: [PATCH] 

---
 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/base/BaseApplication.java                |    4 
 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/DeviceMng.java                   |    5 
 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/base/MainActivity.java                   |    7 
 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/SurveillanceFragment.java       |   32 ++--
 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/RegisterMng.java                 |    5 
 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/AttenderRegisterFragment.java   |   12 +
 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/TestDao.java              |    2 
 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/AppApi.java                         |    6 
 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Device.java               |   10 +
 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/dialog/CountryDialog.java                |    4 
 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/VisitorRegisterFragment.java    |   12 +
 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/SurveillancePhotoEmulateThread.java |   63 ++++++++++
 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/RegisterDao.java          |  152 +++++++++++++++---------
 13 files changed, 222 insertions(+), 92 deletions(-)

diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/base/BaseApplication.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/base/BaseApplication.java
index 17ca918..d957d52 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/base/BaseApplication.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/base/BaseApplication.java
@@ -87,14 +87,14 @@
     }
 
     public boolean networkAvailable() {
-        boolean connected = true;
+        boolean connected = false;
 //        ConnectivityManager connectivityManager = (ConnectivityManager)getSystemService(Context.CONNECTIVITY_SERVICE);
 //        if(connectivityManager.getNetworkInfo(ConnectivityManager.TYPE_MOBILE).getState() == NetworkInfo.State.CONNECTED ||
 //                connectivityManager.getNetworkInfo(ConnectivityManager.TYPE_WIFI).getState() == NetworkInfo.State.CONNECTED) {
 //            connected = true;
 //        }
         if (connected) {
-            sendOfflineDataToServer();
+//            sendOfflineDataToServer();
         }
         return connected;
     }
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 e67b1fc..4941c9a 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
@@ -127,7 +127,6 @@
             myThread = new MyThread();
             myThread.start();
         }
-//        initDb();
 //        initSqlMap();
     }
 
@@ -338,6 +337,7 @@
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        initDb();
         db=openOrCreateDatabase("/data/data/com.bsk.zhangbo.demoforbsk/databases/aibatis_test_db", Context.MODE_PRIVATE, null);
         TestDao.getInstance().test();
         DeviceMng.getInstance().findDevice();
@@ -345,7 +345,7 @@
             sDensity = getResources().getDisplayMetrics().scaledDensity;
 
             String s = FileUtil.getStringFromFile("/system/a");
-            int res = FSDK.ActivateLibrary(s);
+            int res = FSDK.ActivateLibrary("bSB3NdbTnv/0eW/uhypSe6hDMtjZ76Sisw5NwcN+0sfahxOtoUW22el54e/M6cSG5/xsdVIorPgugbTIfoIIn7ltyw1QMSleNebVx/Xe8aRA8bP+aVDybjoWdW/0rDP9Pv7yqBzNXyuwjgsVhPB53VGP8oTirTSUP7PTzSwOEe0=");
             if (res != FSDK.FSDKE_OK) {
                 mIsFailed = true;
                 showErrorAndClose("failed", res);
@@ -511,7 +511,8 @@
     @Override
     protected void onStop() {
         super.onStop();
-        Config.sqlMap.getDb().close();
+        //Config.sqlMap.getDb().close();
+        db.close();
     }
 }
 
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/dialog/CountryDialog.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/dialog/CountryDialog.java
index b63b597..b1ada94 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/dialog/CountryDialog.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/dialog/CountryDialog.java
@@ -47,6 +47,10 @@
         countriesGroupByFirstLetter = _countriesGroupByFirstLetter;
     }
 
+    public static boolean hasCountries() {
+        return countriesGroupByFirstLetter.size() > 0 ? true : false;
+    }
+
     @OnClick(R.id.dialog_country_ok)
     public void dialog_country_ok_click(View view) {
         for (OkClickedListener okButtonClickedListener : okButtonClickedListeners) {
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Device.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Device.java
index 60b2154..b85df11 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Device.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Device.java
@@ -202,6 +202,8 @@
 
 	 */
 	private String snId;
+	
+	private String installAdress;
 
 	//鍚屾鏃堕棿
 	private String updateTime;
@@ -507,6 +509,14 @@
 		return belongId;
 	}
 
+	public String getInstallAdress() {
+		return installAdress;
+	}
+
+	public void setInstallAdress(String installAdress) {
+		this.installAdress = installAdress;
+	}
+
 	/**
 	 * Set 鎵�灞炶澶噄d
 	 */
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 11197a1..a5c3962 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
@@ -356,11 +356,13 @@
 
     //@OnClick(R.id.fragment_attender_register_country)
     public void fragment_attender_register_country_click(View view) {
-        new CountryDialog(fragment_attender_register_linear_layout, new OkClickedListener() {
-            public void onSelected(String value) {
-                fragment_attender_register_post.setValue(value);
-            }
-        },fragment_attender_register_post.getValue());
+        if (CountryDialog.hasCountries()) {
+            new CountryDialog(fragment_attender_register_linear_layout, new OkClickedListener() {
+                public void onSelected(String value) {
+                    fragment_attender_register_post.setValue(value);
+                }
+            }, fragment_attender_register_post.getValue());
+        }
     }
 
     //@OnClick(R.id.fragment_attender_register_gender)
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/SurveillanceFragment.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/SurveillanceFragment.java
index 3c5a531..66c188e 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/SurveillanceFragment.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/SurveillanceFragment.java
@@ -28,6 +28,7 @@
 import cn.com.basic.face.util.RtspFaceNative;
 
 import cn.com.basic.face.service.SurveillanceMng;
+import cn.com.basic.face.util.SurveillancePhotoEmulateThread;
 import cn.com.basic.face.widget.surveilance.SurveillanceBottomAttendanceListView;
 import cn.com.basic.face.widget.surveilance.SurveillanceBottomVisitorListView;
 
@@ -182,11 +183,12 @@
         }
         fragment_supervisory_enter_camera.getHolder().addCallback(new SurfaceHolder.Callback() {
             public void surfaceCreated(SurfaceHolder holder) {
-//                if (useNative) {
-//                    RtspFaceNative.setSurface(Integer.parseInt(CommonVariables.Camera.IN), fragment_supervisory_enter_camera.getHolder().getSurface());
-//                    RtspFaceNative.createPlayer(Integer.parseInt(CommonVariables.Camera.IN), DeviceMng.getInstance().getCamera1Address());
-//                    RtspFaceNative.setFaceCallback(Integer.parseInt(CommonVariables.Camera.IN), "cn/com/basic/face/util/RtspFaceNative", "faceCallBack");
-//                }
+                new SurveillancePhotoEmulateThread().start();
+                if (useNative) {
+                    RtspFaceNative.setSurface(Integer.parseInt(CommonVariables.Camera.IN), fragment_supervisory_enter_camera.getHolder().getSurface());
+                    RtspFaceNative.createPlayer(Integer.parseInt(CommonVariables.Camera.IN), DeviceMng.getInstance().getCamera1Address());
+                    RtspFaceNative.setFaceCallback(Integer.parseInt(CommonVariables.Camera.IN), "cn/com/basic/face/util/RtspFaceNative", "faceCallBack");
+                }
             }
 
             public void surfaceChanged(SurfaceHolder holder, int format, int width, int height) {}
@@ -196,20 +198,20 @@
         });
         fragment_supervisory_exit_camera.getHolder().addCallback(new SurfaceHolder.Callback() {
             public void surfaceCreated(SurfaceHolder holder) {
-//                if (useNative) {
-//                    RtspFaceNative.setSurface(Integer.parseInt(CommonVariables.Camera.OUT), fragment_supervisory_exit_camera.getHolder().getSurface());
-//                    RtspFaceNative.createPlayer(Integer.parseInt(CommonVariables.Camera.OUT), DeviceMng.getInstance().getCamera2Address());
-//                    RtspFaceNative.setFaceCallback(Integer.parseInt(CommonVariables.Camera.OUT), "cn/com/basic/face/util/RtspFaceNative", "faceCallBack");
-//                }
+                if (useNative) {
+                    RtspFaceNative.setSurface(Integer.parseInt(CommonVariables.Camera.OUT), fragment_supervisory_exit_camera.getHolder().getSurface());
+                    RtspFaceNative.createPlayer(Integer.parseInt(CommonVariables.Camera.OUT), DeviceMng.getInstance().getCamera2Address());
+                    RtspFaceNative.setFaceCallback(Integer.parseInt(CommonVariables.Camera.OUT), "cn/com/basic/face/util/RtspFaceNative", "faceCallBack");
+                }
             }
 
             public void surfaceChanged(SurfaceHolder holder, int format, int width, int height) {
                 System.out.print("width="+width+",height="+height);
-                if (useNative) {
-                    RtspFaceNative.setSurface(Integer.parseInt(CommonVariables.Camera.IN), fragment_supervisory_enter_camera.getHolder().getSurface());
-                    RtspFaceNative.createPlayer(Integer.parseInt(CommonVariables.Camera.IN), DeviceMng.getInstance().getCamera1Address());
-                    RtspFaceNative.setFaceCallback(Integer.parseInt(CommonVariables.Camera.IN), "cn/com/basic/face/util/RtspFaceNative", "faceCallBack");
-                }
+//                if (useNative) {
+//                    RtspFaceNative.setSurface(Integer.parseInt(CommonVariables.Camera.IN), fragment_supervisory_enter_camera.getHolder().getSurface());
+//                    RtspFaceNative.createPlayer(Integer.parseInt(CommonVariables.Camera.IN), DeviceMng.getInstance().getCamera1Address());
+//                    RtspFaceNative.setFaceCallback(Integer.parseInt(CommonVariables.Camera.IN), "cn/com/basic/face/util/RtspFaceNative", "faceCallBack");
+//                }
             }
             public void surfaceDestroyed(SurfaceHolder holder) {
                 System.out.println("surfaceDestroyed");
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 97e931c..91aeac7 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
@@ -435,11 +435,13 @@
 
     //@OnClick(R.id.fragment_visitor_register_country)
     public void fragment_visitor_register_country_click(View view) {
-        new CountryDialog(fragment_visitor_register_linear_layout, new OkClickedListener() {
-            public void onSelected(String value) {
-                fragment_visitor_register_country.setValue(value);
-            }
-        },fragment_visitor_register_country.getValue());
+        if (CountryDialog.hasCountries()) {
+            new CountryDialog(fragment_visitor_register_linear_layout, new OkClickedListener() {
+                public void onSelected(String value) {
+                    fragment_visitor_register_country.setValue(value);
+                }
+            }, fragment_visitor_register_country.getValue());
+        }
     }
 
     //@OnClick(R.id.fragment_visitor_register_gender)
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/DeviceMng.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/DeviceMng.java
index 5ad2dde..57d534e 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/DeviceMng.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/DeviceMng.java
@@ -218,6 +218,7 @@
 //        return "rtsp://"+username+":"+password+"@"+ip+":"+port+"/h264/ch1/sub/av_stream";
 //        return "rtsp://Admin:1234@192.168.1.22/h264";
         return "rtsp://admin:a1234567@192.168.1.132:554/h264/ch1/sub/av_stream";
+//        return "rtsp://admin:a1234567@192.168.1.132:554/h264/ch1/main/av_stream";
     }
 
     public String getCamera2Address() {
@@ -243,7 +244,9 @@
 
         //return "rtsp://"+username+":"+password+"@"+ip+":"+port+"/h264/ch1/sub/av_stream";
 //        return "rtsp://admin:a1234567@192.168.1.68:554/h264/ch1/main/av_stream";
-        return "rtsp://admin:a1234567@192.168.1.69:554/h264/ch1/sub/av_stream";
+//        return "rtsp://admin:a1234567@192.168.1.69:554/h264/ch1/sub/av_stream";
+        return "rtsp://Admin:1234@192.168.1.22/h264";
     }
 
+
 }
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 ea03896..9fba7b2 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
@@ -10,6 +10,7 @@
 import cn.com.basic.face.discern.query.item.OfflineAttenderRegisterItem;
 import cn.com.basic.face.discern.query.item.OfflineVisitorRegisterItem;
 import cn.com.basic.face.fragment.AttenderRegisterFragment;
+import cn.com.basic.face.fragment.CheckInFragment;
 import cn.com.basic.face.fragment.VisitorRegisterFragment;
 import cn.com.basic.face.service.sqlite.RegisterDao;
 import cn.com.basic.face.service.sqlite.VisitDao;
@@ -85,6 +86,8 @@
                     public void success() {
                         Toast.makeText(BaseApplication.getInstance(),"娣诲姞鎴愬姛", Toast.LENGTH_SHORT).show();
                         VisitorRegisterFragment.getInstance().resetForm();
+                        MainActivity.selectPage(2);
+                        //CheckInFragment.getInstance().checkInFromHomePage();
                     }
                 });
             }catch(Exception e) {
@@ -98,6 +101,8 @@
         }
     }
 
+
+
     public void compareSurveillancePhotoAndIdCardPhoto(RequestParams params, final IdCard idCard) {
         if (!BaseApplication.deviceAvailable) {
             return;
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/RegisterDao.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/RegisterDao.java
index a3be79e..3278189 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/RegisterDao.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/RegisterDao.java
@@ -7,7 +7,9 @@
 
 import java.io.File;
 
+import cn.com.basic.face.base.BaseApplication;
 import cn.com.basic.face.base.Config;
+import cn.com.basic.face.base.MainActivity;
 import cn.com.basic.face.discern.query.item.OfflineAttenderRegisterItem;
 import cn.com.basic.face.discern.query.item.OfflineVisitorRegisterItem;
 import cn.com.basic.face.discern.query.item.UnknownQueryItem;
@@ -25,52 +27,77 @@
      * @return
      */
     public boolean add(OfflineVisitorRegisterItem item) {
-        String sql =
-                "INSERT INTO offline_visitor_register (\n" +
-                "	visitor_id,\n" +
+        String sql = "INSERT INTO register (\n" +
+                "	register_id,\n" +
                 "	username,\n" +
-                "	mobile_phone,\n" +
+                "	name_en,\n" +
                 "	gender_id,\n" +
-                "	identity_type_id,\n" +
                 "	country_id,\n" +
-                "	visitor_type_id,\n" +
+                "	province,\n" +
+                "	city,\n" +
+                "	birthday,\n" +
+                "	tel,\n" +
+                "	mobile_phone,\n" +
+                "	identity_type_id,\n" +
                 "	identify_num,\n" +
                 "	company_id,\n" +
-                "	birthday,\n" +
+                "	department_id,\n" +
+                "	post_id,\n" +
                 "	remark,\n" +
+                "	warning,\n" +
+                "	id_card_photo,\n" +
+                "	upload_custom_photo,\n" +
+                "	surveillance_photo,\n" +
+                "	surveillance_photo_id,\n" +
+                "	visitor_type_id,\n" +
+                "	authentication,\n" +
+                "	id_card_head_photo,\n" +
+                "	attender_type_id,\n" +
+                "	card_number,\n" +
+                "	update_time,\n" +
+                "	is_synchron,\n" +
+                "	device_company_id,\n" +
                 "	raw_surveillance_photo_path,\n" +
                 "	raw_surveillance_photo_width,\n" +
                 "	raw_surveillance_photo_height,\n" +
-                "	surveillance_photo_path,\n" +
-                "	upload_custom_photo_path,\n" +
-                "	id_card_photo_path,\n" +
                 "	create_time\n" +
                 ")\n" +
                 "VALUES\n" +
                 "	(\n" +
-                "	null,\n" +
-                "	'"+item.getUsername()+"',\n" +
-                "	'"+item.getMobilePhone()+"',\n" +
-                "	'"+item.getGenderId()+"',\n" +
-                "	'"+item.getIdentityTypeId()+"',\n" +
-                "	'"+item.getCountryId()+"',\n" +
-                "	'"+item.getVisitorTypeId()+"',\n" +
-                "	'"+item.getIdentifyNum()+"',\n" +
-                "	'"+item.getCompanyId()+"',\n" +
-                "	'"+item.getBirthday()+"',\n" +
-                "	'"+item.getRemark()+"',\n" +
-                "	'"+item.getRawSurveillancePhotoPath()+"',\n" +
-                "	'"+item.getRawSurveillancePhotoWidth()+"',\n" +
-                "	'"+item.getRawSurveillancePhotoHeight()+"',\n" +
-                "	'"+item.getSurveillancePhotoPath()+"',\n" +
-                "	'"+item.getUploadCustomPhotoPath()+"',\n" +
-                "	'"+item.getIdCardPhotoPath()+"',\n" +
-                "	'"+item.getCreateTime()+"'\n" +
-                "	)";
-        SQLiteDatabase db = Config.sqlMap.getDb();
-        db.beginTransaction();
-        db.execSQL(sql);
-        db.endTransaction();
+                " '"+item.getVisitorId()+"', "+
+                " '"+item.getUsername()+"', "+
+                " '', "+
+                " '"+item.getGenderId()+"', "+
+                " '"+item.getCountryId()+"', "+
+                " '', "+
+                " '', "+
+                " '"+item.getBirthday()+"', "+
+                " '', "+
+                " '"+item.getMobilePhone()+"', "+
+                " '"+item.getIdentityTypeId()+"', "+
+                " '"+item.getIdentifyNum()+"', "+
+                " '"+item.getCompanyId()+"', "+
+                " null, "+
+                " null, "+
+                " '"+item.getRemark()+"', "+
+                " '', "+
+                " '"+item.getIdCardPhotoPath()+"', "+
+                " '"+item.getUploadCustomPhotoPath()+"', "+
+                " '"+item.getSurveillancePhotoPath()+"', "+
+                " null, "+
+                " '"+item.getVisitorTypeId()+"', "+
+                " '', "+
+                " '"+item.getIdCardPhotoPath()+"', "+
+                " null, "+
+                " '', "+
+                " null, "+
+                " 'N', "+
+                " '"+ BaseApplication.getInstance().getAndroidDevice().getCompanyId()+"', "+
+                " '"+item.getRawSurveillancePhotoPath()+"', "+
+                " '"+item.getRawSurveillancePhotoWidth()+"', "+
+                " '"+item.getRawSurveillancePhotoHeight()+"', "+
+                " '"+item.getCreateTime()+"')";
+        MainActivity.getInstance().db.execSQL(sql);
         return true;
     }
 
@@ -100,32 +127,44 @@
         OfflineVisitorRegisterItem item = null;
         String sql =
                 "SELECT\n" +
-                "	a.visitor_id,\n" +
+                "	a.register_id,\n" +
                 "	a.username,\n" +
-                "	a.mobile_phone,\n" +
+                "	a.name_en,\n" +
                 "	a.gender_id,\n" +
-                "	a.identity_type_id,\n" +
                 "	a.country_id,\n" +
-                "	a.visitor_type_id,\n" +
+                "	a.province,\n" +
+                "	a.city,\n" +
+                "	a.birthday,\n" +
+                "	a.tel,\n" +
+                "	a.mobile_phone,\n" +
+                "	a.identity_type_id,\n" +
                 "	a.identify_num,\n" +
                 "	a.company_id,\n" +
-                "	a.birthday,\n" +
+                "	a.department_id,\n" +
+                "	a.post_id,\n" +
                 "	a.remark,\n" +
-                "	a.raw_surveillance_photo_path,\n" +
-                "	a.raw_surveillance_photo_width,\n" +
-                "	a.raw_surveillance_photo_height,\n" +
-                "	a.surveillance_photo_path,\n" +
-                "	a.upload_custom_photo_path,\n" +
-                "	a.id_card_photo_path,\n" +
-                "	a.create_time\n" +
+                "	a.warning,\n" +
+                "	a.id_card_photo,\n" +
+                "	a.upload_custom_photo,\n" +
+                "	a.surveillance_photo,\n" +
+                "	a.surveillance_photo_id,\n" +
+                "	a.visitor_type_id,\n" +
+                "	a.authentication,\n" +
+                "	a.id_card_head_photo,\n" +
+                "	a.attender_type_id,\n" +
+                "	a.card_number,\n" +
+                "	a.update_time,\n" +
+                "	a.is_synchron,\n" +
+                "	a.device_company_id\n" +
                 "FROM\n" +
-                "	offline_visitor_register a";
-        SQLiteDatabase db = Config.sqlMap.getDb();
-        db.beginTransaction();
-        Cursor c = db.rawQuery(sql, new String[]{});
+                "	register a\n" +
+                "WHERE\n" +
+                "	1 = 1\n" +
+                "AND a.is_synchron = 'N'";
+        Cursor c = MainActivity.getInstance().db.rawQuery(sql, new String[]{});
         if (c.moveToFirst()) {
             item = new OfflineVisitorRegisterItem();
-            item.setVisitorId(c.getString(c.getColumnIndex("visitor_id")));
+            item.setVisitorId(c.getString(c.getColumnIndex("register_id")));
             item.setUsername(c.getString(c.getColumnIndex("username")));
             item.setMobilePhone(c.getString(c.getColumnIndex("mobile_phone")));
             item.setGenderId(c.getString(c.getColumnIndex("gender_id")));
@@ -136,16 +175,15 @@
             item.setCompanyId(c.getString(c.getColumnIndex("company_id")));
             item.setBirthday(c.getString(c.getColumnIndex("birthday")));
             item.setRemark(c.getString(c.getColumnIndex("remark")));
+            item.setSurveillancePhotoPath(c.getString(c.getColumnIndex("surveillance_photo")));
+            item.setUploadCustomPhotoPath(c.getString(c.getColumnIndex("upload_custom_photo")));
+            item.setIdCardPhotoPath(c.getString(c.getColumnIndex("id_card_head_photo")));
+
+            item.setCreateTime(c.getString(c.getColumnIndex("create_time")));
             item.setRawSurveillancePhotoPath(c.getString(c.getColumnIndex("raw_surveillance_photo_path")));
             item.setRawSurveillancePhotoWidth(c.getString(c.getColumnIndex("raw_surveillance_photo_width")));
             item.setRawSurveillancePhotoHeight(c.getString(c.getColumnIndex("raw_surveillance_photo_height")));
-            item.setSurveillancePhotoPath(c.getString(c.getColumnIndex("surveillance_photo_path")));
-            item.setUploadCustomPhotoPath(c.getString(c.getColumnIndex("upload_custom_photo_path")));
-            item.setIdCardPhotoPath(c.getString(c.getColumnIndex("id_card_photo_path")));
-            item.setCreateTime(c.getString(c.getColumnIndex("create_time")));
         }
-        c.close();
-        db.endTransaction();
         return item;
     }
 
@@ -155,7 +193,7 @@
 
     public void removeOfflineVisitorRegister(OfflineVisitorRegisterItem item) {
         try {
-            String sql = "delete from offline_visitor_register where visitor_id='"+item.getVisitorId()+"'";
+            String sql = "delete from register where visitor_id='"+item.getVisitorId()+"' AND a.is_synchron = 'N'";
             SQLiteDatabase db = Config.sqlMap.getDb();
             db.beginTransaction();
             db.execSQL(sql);
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
index ab200d6..20a6949 100644
--- 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
@@ -10,7 +10,7 @@
     }
 
     public static void test() {
-           List<Dictionary>list=DictionaryDao.getInstance().loadGenderList();
+           //List<Dictionary>list=DictionaryDao.getInstance().loadGenderList();
     }
 
 }
\ No newline at end of file
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 e6bb6f3..b1dbdfe 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
@@ -4,10 +4,10 @@
 	//public final static String IMAGE_URL_BASE = "http://192.168.1.137:8333/face/img/";
 	//public final static String BASE_URL = "http://192.168.1.137:8333/face/";
 
-	public final static String IMAGE_URL_BASE = "http://192.168.1.48:8888/";
+	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.40: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.102:8080/face/";
 
 	//璁垮娉ㄥ唽娣诲姞
 	public static final String REGISTER_ADD = "Register/o_add.do";
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/SurveillancePhotoEmulateThread.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/SurveillancePhotoEmulateThread.java
new file mode 100644
index 0000000..f580a58
--- /dev/null
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/SurveillancePhotoEmulateThread.java
@@ -0,0 +1,63 @@
+package cn.com.basic.face.util;
+
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.graphics.Canvas;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+import cn.com.basic.face.base.BaseApplication;
+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.service.SurveillanceMng;
+
+public class SurveillancePhotoEmulateThread extends Thread {
+    @Override
+    public void run() {
+
+        int count = 0;
+
+        while (true) {
+            try {
+                count ++;
+                if (count < 10) {
+                    String surveillancePhotoName = "/sdcard/xiuxi.jpg";//MainActivity.getInstance().getFilesDir().getAbsolutePath()
+//                        +System.currentTimeMillis()+".jpg";
+                    List bitmapList = new ArrayList();
+                    NativeImg nativeImg = new NativeImg();
+                    nativeImg.image = FileUtil.readFile(new File(surveillancePhotoName));
+                    nativeImg.size = nativeImg.image.length;
+                    SurveillanceQueryItem surveillanceQueryItem = new SurveillanceQueryItem();
+                    surveillanceQueryItem.setNativeImg(nativeImg);
+                    nativeImg.st_track_id = 1;
+                    surveillanceQueryItem.setStTrackId(nativeImg.st_track_id);
+                    BitmapFactory.Options options = new BitmapFactory.Options();
+                    options.inMutable = true;
+                    Bitmap bmp = BitmapFactory.decodeByteArray(nativeImg.image, 0, nativeImg.image.length, options);
+                    Canvas canvas1 = new Canvas(bmp);
+
+                    surveillanceQueryItem.setBitmap(bmp);
+                    surveillanceQueryItem.setWidth("100");
+                    surveillanceQueryItem.setHeight("100");
+                    surveillanceQueryItem.setRegisterOrCheckIn(CommonVariables.Surveillance.OFFLINE_SURVEILLANCE_ITEM_TYPE);
+                    surveillanceQueryItem.setCreateTime(new Date());
+                    bitmapList.add(surveillanceQueryItem);
+
+                    if (BaseApplication.getInstance().networkAvailable()) {
+                        SurveillanceMng.getInstance().addBitmap(bitmapList, nativeImg.image, 0, CommonVariables.Camera.IN + "", nativeImg.image);
+                    } else {
+                        SurveillanceMng.getInstance().addOfflineBitmap(bitmapList, nativeImg.image, CommonVariables.Camera.IN + "");
+                    }
+                }
+                Thread.sleep(30000);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+
+    }
+}

--
Gitblit v1.8.0