From 178f62a60f4d34ccfe83e81452d5c84fab7e5045 Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期四, 25 五月 2017 17:35:52 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/src/main/res/layout/load_more.xml | 2 +-
/dev/null | 35 -----------------------------------
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/DeviceMng.java | 16 +++++++++++-----
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/SurveillanceFragment.java | 2 +-
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/common/BaseCommonCallBack.java | 5 +++++
5 files changed, 18 insertions(+), 42 deletions(-)
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/common/BaseCommonCallBack.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/common/BaseCommonCallBack.java
index c5d84c7..e16c108 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/common/BaseCommonCallBack.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/common/BaseCommonCallBack.java
@@ -11,6 +11,7 @@
import org.xutils.ex.HttpException;
import java.net.ConnectException;
+import java.net.SocketTimeoutException;
import java.util.List;
public abstract class BaseCommonCallBack implements Callback.CommonCallback<ResultBean>{
@@ -58,6 +59,10 @@
@Override
public void onError(Throwable ex, boolean isOnCallback) {
+ if (ex instanceof SocketTimeoutException) {
+ Toast.makeText(BaseApplication.getInstance(), "socket杩炴帴瓒呮椂", Toast.LENGTH_SHORT ).show();
+ return;
+ }
if (ex instanceof ConnectException) {
Toast.makeText(BaseApplication.getInstance(), "鏈嶅姟鍣ㄨ繛鎺ュけ璐�", Toast.LENGTH_SHORT ).show();
return;
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 b907669..e103581 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
@@ -81,7 +81,7 @@
} else {
useNative = true;
}
- useNative = false;
+ //useNative = false;
if (useNative) {
System.loadLibrary("cvface_api");
System.loadLibrary("opencv_java3");
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 1f50ccf..ed676f0 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
@@ -22,7 +22,7 @@
public class DeviceMng {
public static DeviceMng instance = new DeviceMng();
- public static String authorationId = null;
+ public static String authorationId = "101";
public static DeviceMng getInstance() {
return instance;
@@ -50,10 +50,16 @@
public void load () {
try {
- if (authorationId == null || authorationId.trim().length() <= 1) {
- getAuthorationId();
- return;
- }
+// if (authorationId == null || authorationId.trim().length() <= 1) {
+// getAuthorationId();
+// MainActivity.getInstance().runOnUiThread(new Runnable() {
+// @Override
+// public void run() {
+// Toast.makeText(MainActivity.getInstance(), "璇峰～鍐欒澶囧簭鍒楀彿", Toast.LENGTH_SHORT).show();
+// }
+// });
+// return;
+// }
RequestParams params = new RequestParams(AppApi.BASE_URL + AppApi.Query.DEVICE_QUERY);
params.addBodyParameter(Device.FieldNames.authorizationId, authorationId);
x.http().post(params, new BaseCommonCallBack() {
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/checkin/TextViewExtension.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/checkin/TextViewExtension.java
deleted file mode 100644
index abc052d..0000000
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/checkin/TextViewExtension.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package cn.com.basic.face.widget.checkin;
-
-import android.content.Context;
-import android.widget.TextView;
-
-public class TextViewExtension extends TextView {
-
-
-protected OnVisibilityChange mChangeListener = null;
-
- public interface OnVisibilityChange{
- void onChange(TextViewExtension mTextView , int mPrevVisibility , int mNewVisibility);
- }
-
- public TextViewExtension(Context context) {
- super(context);
- // TODO Auto-generated constructor stub
- }
-
- /* (non-Javadoc)
- * @see android.view.View#setVisibility(int)
- */
- @Override
- public void setVisibility(int visibility) {
- // TODO Auto-generated method stub
- super.setVisibility(visibility);
- if(mChangeListener != null){
- mChangeListener.onChange(this, getVisibility() , visibility);
- }
- }
-
- public void setOnVisibilityChange(OnVisibilityChange mChangeListener ){
- this.mChangeListener = mChangeListener;
- }
-}
\ No newline at end of file
diff --git a/VisitFace/DemoForBsk/app/src/main/res/layout/load_more.xml b/VisitFace/DemoForBsk/app/src/main/res/layout/load_more.xml
index c359182..65cff9d 100644
--- a/VisitFace/DemoForBsk/app/src/main/res/layout/load_more.xml
+++ b/VisitFace/DemoForBsk/app/src/main/res/layout/load_more.xml
@@ -4,7 +4,7 @@
android:layout_height="wrap_content"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:orientation="vertical">
- <cn.com.basic.face.widget.checkin.TextViewExtension
+ <TextView
android:id="@+id/load_more_text_view"
android:paddingTop="@dimen/h20dp"
android:paddingBottom="@dimen/h20dp"
--
Gitblit v1.8.0