xuxiuxi
2017-03-23 7d99c9d1c045f31d27676f8907c3b779039d41a2


git-svn-id: http://192.168.1.226/svn/proxy@172 454eff88-639b-444f-9e54-f578c98de674
1个文件已添加
5个文件已修改
51 ■■■■ 已修改文件
VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/ui/fragment/OneFragment.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/ui/fragment/RegisterFragment.java 14 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/util/AppApi.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/util/RtspFaceNative.java 29 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/jniLibs/xUtils-2.6.14.jar 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/res/layout/fragment_register.xml 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/ui/fragment/OneFragment.java
@@ -70,7 +70,7 @@
    /** Load jni .so on initialization */
    static {
        System.loadLibrary("rtspface");//xiuxi
        //System.loadLibrary("rtspface");//xiuxi
    }
VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/ui/fragment/RegisterFragment.java
@@ -5,13 +5,10 @@
import android.view.View;
import android.widget.DatePicker;
import android.widget.EditText;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.TextView;
import android.widget.Toast;
import com.bsk.zhangbo.demoforbsk.R;
import com.bsk.zhangbo.demoforbsk.base.BaseApplication;
import com.bsk.zhangbo.demoforbsk.base.BaseFragment;
import com.bsk.zhangbo.demoforbsk.service.DictionaryMng;
import com.bsk.zhangbo.demoforbsk.service.VisitorTypeMng;
@@ -22,9 +19,6 @@
import com.lidroid.xutils.ViewUtils;
import com.lidroid.xutils.view.annotation.ViewInject;
import com.lidroid.xutils.view.annotation.event.OnClick;
import org.xutils.view.annotation.ContentView;
import org.xutils.x;
import java.util.Calendar;
import java.util.Date;
@@ -55,9 +49,9 @@
    @ViewInject(R.id.register_name)
    private View mViewName;
    @ViewInject(R.id.register_sex)
    @ViewInject(R.id.register_gender)
    private View mViewSex;
    @ViewInject(R.id.register_nation)
    @ViewInject(R.id.register_country)
    private View mViewNation;
    @ViewInject(R.id.register_birthday)
    private View mViewBirthday;
@@ -143,7 +137,7 @@
        mCredentialsList = DictionaryMng.mCredentialsList;
    }
    @OnClick(R.id.register_sex)
    @OnClick(R.id.register_gender)
    public void selectGender(View view) {
        SingleSelectionPopup popup = new SingleSelectionPopup(getActivity(),mSexList,"性别");
        popup.showAtLocation(mBaseLayout, Gravity.CENTER,0,0);
@@ -155,7 +149,7 @@
        });
    }
    @OnClick(R.id.register_nation)
    @OnClick(R.id.register_country)
    public void selectCountry(View view) {
        CountrySelectionPopup countrySelectionPopup = new CountrySelectionPopup(getActivity());
        countrySelectionPopup.showAtLocation(mBaseLayout, Gravity.CENTER,0,0);
VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/util/AppApi.java
@@ -3,7 +3,7 @@
public class AppApi {
    public final static String CHENXINGGROUND_IMAGEURL_BASE = "";
    public final static String CHENXINGARGEEMRNT = "";// 协议前缀
    public final static String BASEURL = "http://192.168.1.51:8080/ssm/";
    public final static String BASEURL = "http://192.168.1.27:8080/ssm/";
    public final static String VISITOR_TYPE_LIST = "VisitorType/v_list.do";
VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/util/RtspFaceNative.java
@@ -9,15 +9,26 @@
public class RtspFaceNative {
    public static native void init();
    public static native void setSurface(int cameraIdx, Surface surface);
    public static native boolean createPlayer(int cameraIdx, String uri);
    public static native void shutdown(int cameraIdx);
//    public static native void init();
//    public static native void setSurface(int cameraIdx, Surface surface);
//    public static native boolean createPlayer(int cameraIdx, String uri);
//    public static native void shutdown(int cameraIdx);
//    // typedef void (* Java_com_example_nativecodec_NativeCodec_FaceCallback_func)(int cameraIdx, int count);
//    public static native boolean setFaceCallback(int cameraIdx, String func);
//    public static native void lockFace(int cameraIdx);
//    public static native void releaseFace(int cameraIdx);
//    public static native boolean getFaceList(int cameraIdx, byte[] faceListPb);
//    public static native boolean getFaceImages(int cameraIdx, byte[] faceImagesIdx, byte[] faceImages);
    public static void init() {};
    public static  void setSurface(int cameraIdx, Surface surface){};
    public static  boolean createPlayer(int cameraIdx, String uri){return true;};
    public static  void shutdown(int cameraIdx){};
    // typedef void (* Java_com_example_nativecodec_NativeCodec_FaceCallback_func)(int cameraIdx, int count);
    public static native boolean setFaceCallback(int cameraIdx, String func);
    public static native void lockFace(int cameraIdx);
    public static native void releaseFace(int cameraIdx);
    public static native boolean getFaceList(int cameraIdx, byte[] faceListPb);
    public static native boolean getFaceImages(int cameraIdx, byte[] faceImagesIdx, byte[] faceImages);
    public static  boolean setFaceCallback(int cameraIdx, String func){return true;};
    public static  void lockFace(int cameraIdx){};
    public static  void releaseFace(int cameraIdx){};
    public static  boolean getFaceList(int cameraIdx, byte[] faceListPb){return true;};
    public static  boolean getFaceImages(int cameraIdx, byte[] faceImagesIdx, byte[] faceImages){return true;};
}
VisitFace/DemoForBsk/app/src/main/jniLibs/xUtils-2.6.14.jar
Binary files differ
VisitFace/DemoForBsk/app/src/main/res/layout/fragment_register.xml
@@ -83,11 +83,11 @@
                        android:layout_height="wrap_content"
                        android:layout_width="278dp"/>
                    <include layout="@layout/register_textview"
                        android:id="@+id/register_sex"
                        android:id="@+id/register_gender"
                        android:layout_height="wrap_content"
                        android:layout_width="278dp"/>
                    <include layout="@layout/register_textview"
                        android:id="@+id/register_nation"
                        android:id="@+id/register_country"
                        android:layout_height="wrap_content"
                        android:layout_width="278dp"/>
                    <include layout="@layout/register_textview"