From c7d60f1695f7fd2c8b1ff7a1e4965d4697aca7ac Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期二, 27 六月 2017 14:25:28 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/RegisterFragment.java | 6 ++++++
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/AppApi.java | 2 --
VisitFace/DemoForBsk/app/build.gradle | 17 +++++++++++++----
VisitFace/DemoForBsk/app/app.iml | 29 ++++++++++++++++++++---------
4 files changed, 39 insertions(+), 15 deletions(-)
diff --git a/VisitFace/DemoForBsk/app/app.iml b/VisitFace/DemoForBsk/app/app.iml
index e0d5f94..a567499 100644
--- a/VisitFace/DemoForBsk/app/app.iml
+++ b/VisitFace/DemoForBsk/app/app.iml
@@ -69,13 +69,6 @@
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
- <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
- <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
- <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
- <sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
- <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
- <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
- <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
@@ -83,6 +76,13 @@
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
+ <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
+ <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
+ <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
+ <sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
+ <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+ <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
+ <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
@@ -94,6 +94,7 @@
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support.test/rules/0.5/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support.test/runner/0.5/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/23.1.0/jars" />
+ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/cardview-v7/23.1.0/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/design/23.1.0/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/recyclerview-v7/23.1.0/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/23.1.0/jars" />
@@ -103,10 +104,12 @@
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.facebook.fresco/fresco/1.1.0/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.facebook.fresco/imagepipeline-base/1.1.0/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.facebook.fresco/imagepipeline/1.1.0/jars" />
+ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.github.markomilos/paginate/0.5.1/jars" />
+ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.jude/easyrecyclerview/4.4.0/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.lzy.net/okhttpserver/1.0.3/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.lzy.net/okhttputils/1.8.1/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.orhanobut/logger/1.15/jars" />
- <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.wx.wheelview/wheelview/1.3.3/jars" />
+ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/org.xutils/xutils/3.3.42/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
@@ -123,36 +126,44 @@
<orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" exported="" name="okio-1.9.0" level="project" />
+ <orderEntry type="library" exported="" name="universal-image-loader-1.9.2-SNAPSHOT-with-sources" level="project" />
<orderEntry type="library" exported="" name="imagepipeline-base-1.1.0" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="runner-0.5" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="espresso-idling-resource-2.2.2" level="project" />
<orderEntry type="library" exported="" name="gson-2.8.0" level="project" />
<orderEntry type="library" exported="" name="easyrecyclerview-1.3" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="hamcrest-library-1.3" level="project" />
+ <orderEntry type="library" exported="" name="xutils-3.3.42" level="project" />
<orderEntry type="library" exported="" name="okhttputils-1.8.1" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="hamcrest-integration-1.3" level="project" />
<orderEntry type="library" exported="" name="bolts-tasks-1.4.0" level="project" />
<orderEntry type="library" exported="" name="drawee-1.1.0" level="project" />
<orderEntry type="library" exported="" name="fbcore-1.1.0" level="project" />
+ <orderEntry type="library" exported="" name="xUtils-2.6.14" level="project" />
<orderEntry type="library" exported="" name="recyclerview-v7-23.1.0" level="project" />
<orderEntry type="library" exported="" name="support-v4-23.1.0" level="project" />
- <orderEntry type="library" exported="" name="wheelview-1.3.3" level="project" />
<orderEntry type="library" exported="" name="support-annotations-23.1.1" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="jsr305-2.0.1" level="project" />
<orderEntry type="library" exported="" name="appcompat-v7-23.1.0" level="project" />
<orderEntry type="library" exported="" name="fresco-1.1.0" level="project" />
+ <orderEntry type="library" exported="" name="easyrecyclerview-4.4.0" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="espresso-core-2.2.2" level="project" />
+ <orderEntry type="library" exported="" name="pinyin4j-2.5.0" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="exposed-instrumentation-api-publish-0.5" level="project" />
<orderEntry type="library" exported="" name="okhttpserver-1.0.3" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="rules-0.5" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="javax.annotation-api-1.2" level="project" />
+ <orderEntry type="library" exported="" name="cardview-v7-23.1.0" level="project" />
+ <orderEntry type="library" exported="" name="fastjson-1.2.29" level="project" />
<orderEntry type="library" exported="" name="imagepipeline-1.1.0" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="javax.inject-1" level="project" />
<orderEntry type="library" exported="" name="design-23.1.0" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="javawriter-2.1.1" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="hamcrest-core-1.3" level="project" />
<orderEntry type="library" exported="" name="okhttp-3.4.1" level="project" />
+ <orderEntry type="library" exported="" name="paginate-0.5.1" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="junit-4.12" level="project" />
<orderEntry type="library" exported="" name="logger-1.15" level="project" />
+ <orderEntry type="library" exported="" name="android-android-23" level="project" />
</component>
</module>
\ No newline at end of file
diff --git a/VisitFace/DemoForBsk/app/build.gradle b/VisitFace/DemoForBsk/app/build.gradle
index 6184ef2..dca995c 100644
--- a/VisitFace/DemoForBsk/app/build.gradle
+++ b/VisitFace/DemoForBsk/app/build.gradle
@@ -5,15 +5,15 @@
buildToolsVersion "23.0.3"
defaultConfig {
applicationId "com.bsk.zhangbo.demoforbsk"
- minSdkVersion 21
+ minSdkVersion 19
targetSdkVersion 23
versionCode 1
versionName "1.0"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
ndk {
-// abiFilters 'x86', 'x86_64', 'armeabi', 'armeabi-v7a', 'arm64-v8a'
- abiFilters 'armeabi-v7a'
+ //abiFilters 'x86', 'x86_64', 'armeabi', 'armeabi-v7a', 'arm64-v8a'
+ // abiFilters 'armeabi-v7a'
}
externalNativeBuild {
cmake {
@@ -47,7 +47,7 @@
compile 'com.android.support:design:23.1.0'
compile 'com.camnter.easyrecyclerview:easyrecyclerview:1.3'
compile 'com.facebook.fresco:fresco:1.1.0'
- compile 'com.wx.wheelview:wheelview:1.3.3'
+ //compile 'com.wx.wheelview:wheelview:1.3.3'
compile 'com.google.code.gson:gson:2.8.0'
compile 'com.orhanobut:logger:1.15'
compile 'com.google.code.gson:gson:2.8.0'
@@ -59,4 +59,13 @@
compile 'com.alibaba:fastjson:1.2.29'
compile 'com.belerweb:pinyin4j:2.5.0'
compile fileTree(dir: 'libs', include: ['.jar','.so'])
+ compile 'org.xutils:xutils:3.3.42'
+ compile 'com.alibaba:fastjson:1.2.29'
+ compile 'com.belerweb:pinyin4j:2.5.0'
+ compile fileTree(dir: 'libs', include: ['.jar','.so'])
+ compile 'com.github.markomilos:paginate:0.5.1'
+ compile 'com.jude:easyrecyclerview:4.4.0'
+ compile 'com.android.support:appcompat-v7:23.1.0'
+ compile 'com.android.support:recyclerview-v7:23.1.0'
+ compile 'com.android.support:cardview-v7:23.1.0'
}
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 c11daf8..8ccebbd 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
@@ -141,10 +141,16 @@
@OnClick(R.id.fragment_register_save)
public void fragment_register_save_click(View v) {
+
if (!BaseApplication.deviceAvailable) {
return;
}
+// SurveillanceMng.getInstance().addBitmap(new ArrayList(), new byte[]{1,2,3}, 3, "1");
+//
+// if (1==1) {
+// return;
+// }
RequestParams params = new RequestParams();
String name = fragment_register_name.getValue();
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 57a23f5..bf4b362 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
@@ -1,8 +1,6 @@
package cn.com.basic.face.util;
public class AppApi {
-// public final static String IMAGE_URL_BASE = "http://192.168.1.141/AI/img/";
-// public final static String BASE_URL = "http://192.168.1.141/AI/";
//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/";
--
Gitblit v1.8.0