xuxiuxi
2017-05-25 178f62a60f4d34ccfe83e81452d5c84fab7e5045


git-svn-id: http://192.168.1.226/svn/proxy@640 454eff88-639b-444f-9e54-f578c98de674
1个文件已删除
4个文件已修改
60 ■■■■■ 已修改文件
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/common/BaseCommonCallBack.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/SurveillanceFragment.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/DeviceMng.java 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/checkin/TextViewExtension.java 35 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/res/layout/load_more.xml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
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;
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");
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() {
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/checkin/TextViewExtension.java
File was deleted
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"