From 2d260689927acac6d67280993689c2cb6149a40b Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期三, 21 六月 2017 18:05:21 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/RegisterFragment.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/service/DeviceMng.java | 4 ++--
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/SurveillanceFragment.java | 2 --
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/CheckInMng.java | 34 +++++++++++++++++-----------------
5 files changed, 23 insertions(+), 25 deletions(-)
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/RegisterFragment.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/RegisterFragment.java
index 946fbab..c11daf8 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/RegisterFragment.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/RegisterFragment.java
@@ -273,7 +273,7 @@
protected void onPostExecute(String result) {
try {
Toast.makeText(BaseApplication.getInstance(),"娣诲姞鎴愬姛", Toast.LENGTH_SHORT).show();
- RegisterFragment.getInstance().resetForm();
+ //RegisterFragment.getInstance().resetForm();
} catch(Exception e) {
e.printStackTrace();
}
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 849a21c..8b3a744 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
@@ -112,7 +112,6 @@
} catch (SocketException ex) {}
try{
-
//Process su = Runtime.getRuntime().exec("su");
//DataOutputStream outputStream = new DataOutputStream(su.getOutputStream());
@@ -128,7 +127,6 @@
}catch(Exception e){
e.printStackTrace();
}
-
// outputStream.writeBytes("busybox ifconfig wlan0 hw ether 00:e0:2c:31:1a:ba\n");
RtspFaceNative.setLocalIP(ipAddress);
}
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/CheckInMng.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/CheckInMng.java
index 20e21b3..718a4ec 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/CheckInMng.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/CheckInMng.java
@@ -1,28 +1,28 @@
package cn.com.basic.face.service;
-import android.widget.Toast;
+ import android.widget.Toast;
-import cn.com.basic.face.base.BaseApplication;
-import cn.com.basic.face.discern.common.CommonVariables;
-import cn.com.basic.face.discern.query.condition.CheckInQueryCondition;
-import cn.com.basic.face.fragment.CheckInFragment;
-import cn.com.basic.face.util.AppApi;
+ import cn.com.basic.face.base.BaseApplication;
+ import cn.com.basic.face.discern.common.CommonVariables;
+ import cn.com.basic.face.discern.query.condition.CheckInQueryCondition;
+ import cn.com.basic.face.fragment.CheckInFragment;
+ import cn.com.basic.face.util.AppApi;
-import org.xutils.http.RequestParams;
-import org.xutils.x;
+ import org.xutils.http.RequestParams;
+ import org.xutils.x;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
+ import java.util.ArrayList;
+ import java.util.Collections;
+ import java.util.Comparator;
+ import java.util.List;
-import cn.com.basic.face.discern.common.BaseCommonCallBack;
-import cn.com.basic.face.discern.query.item.CheckInQueryItem;
-import cn.com.basic.face.util.CharacterParser;
+ import cn.com.basic.face.discern.common.BaseCommonCallBack;
+ import cn.com.basic.face.discern.query.item.CheckInQueryItem;
+ import cn.com.basic.face.util.CharacterParser;
-public class CheckInMng extends BaseMng {
+ public class CheckInMng extends BaseMng {
- public static CheckInMng instance = new CheckInMng();
+ public static CheckInMng instance = new CheckInMng();
public static CheckInMng getInstance() {
return instance;
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 196344b..09cdb4c 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
@@ -190,7 +190,7 @@
// }
// return "rtsp://"+username+":"+password+"@"+ip+":"+port+"/h264/ch1/sub/av_stream";
- return "rtsp://admin:a1234567@192.168.1.68:554/h264/ch1/sub/av_stream";
+ return "rtsp://Admin:1234@192.168.1.22/h264";
}
@@ -215,7 +215,7 @@
// }
//return "rtsp://"+username+":"+password+"@"+ip+":"+port+"/h264/ch1/sub/av_stream";
- return "rtsp://Admin:1234@192.168.1.22/h264_2";
+ return "rtsp://admin:a1234567@192.168.1.68:554/h264/ch1/main/av_stream";
}
}
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 854c8b7..57a23f5 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
@@ -6,9 +6,9 @@
//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.137:8888/";
-// public final static String BASE_URL = "http://192.168.1.51/face/";
- public final static String BASE_URL = "http://192.168.1.137:8333/face/";
+ public final static String IMAGE_URL_BASE = "http://192.168.1.4:8888/";
+ public final static String BASE_URL = "http://192.168.1.51/face/";
+// public final static String BASE_URL = "http://192.168.1.4:8333/face/";
public static final String REGISTER_ADD = "Register/o_add.do";
--
Gitblit v1.8.0