From 370f1eb822076137e3bae53e2e36451c977c8834 Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期五, 31 三月 2017 17:34:58 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/RegisterFragment.java | 35 +---
/dev/null | 356 --------------------------------------------------
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/SearchEditText.java | 7
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/SupervisoryBottomListView.java | 7 -
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/dialog/SingleSelectionDialog.java | 2
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/dialog/BirthdayPickerDialog.java | 2
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/dialog/VisitReasonDialog.java | 2
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/CheckInFragment.java | 2
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/dialog/CountrySelectionDialog.java | 2
9 files changed, 15 insertions(+), 400 deletions(-)
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/BirthdayPickerDialog.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/dialog/BirthdayPickerDialog.java
similarity index 98%
rename from VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/BirthdayPickerDialog.java
rename to VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/dialog/BirthdayPickerDialog.java
index 759e3ee..c1f3a57 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/BirthdayPickerDialog.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/dialog/BirthdayPickerDialog.java
@@ -1,4 +1,4 @@
-package cn.com.basic.face.widget;
+package cn.com.basic.face.dialog;
import android.app.AlertDialog;
import android.app.DatePickerDialog;
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/CountrySelectionDialog.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/dialog/CountrySelectionDialog.java
similarity index 99%
rename from VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/CountrySelectionDialog.java
rename to VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/dialog/CountrySelectionDialog.java
index c62eb58..7993c4d 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/CountrySelectionDialog.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/dialog/CountrySelectionDialog.java
@@ -1,4 +1,4 @@
-package cn.com.basic.face.widget;
+package cn.com.basic.face.dialog;
import android.content.Context;
import android.graphics.Color;
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/SingleSelectionDialog.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/dialog/SingleSelectionDialog.java
similarity index 99%
rename from VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/SingleSelectionDialog.java
rename to VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/dialog/SingleSelectionDialog.java
index edac0a0..13027de 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/SingleSelectionDialog.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/dialog/SingleSelectionDialog.java
@@ -1,4 +1,4 @@
-package cn.com.basic.face.widget;
+package cn.com.basic.face.dialog;
import android.content.Context;
import android.graphics.Color;
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/VisitReasonDialog.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/dialog/VisitReasonDialog.java
similarity index 99%
rename from VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/VisitReasonDialog.java
rename to VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/dialog/VisitReasonDialog.java
index 25f5d0e..e5facbc 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/VisitReasonDialog.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/dialog/VisitReasonDialog.java
@@ -1,4 +1,4 @@
-package cn.com.basic.face.widget;
+package cn.com.basic.face.dialog;
import android.content.Context;
import android.graphics.Color;
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/CheckInFragment.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/CheckInFragment.java
index 2c078f7..d287705 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/CheckInFragment.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/CheckInFragment.java
@@ -20,7 +20,7 @@
import cn.com.basic.face.widget.CheckInIntervieweeCell;
import cn.com.basic.face.widget.CheckInLeftListView;
import cn.com.basic.face.widget.CheckInRightVisitorCell;
-import cn.com.basic.face.widget.VisitReasonDialog;
+import cn.com.basic.face.dialog.VisitReasonDialog;
import com.lidroid.xutils.view.annotation.ViewInject;
import com.lidroid.xutils.view.annotation.event.OnClick;
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 176eded..c43f90c 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
@@ -9,10 +9,8 @@
import android.view.Gravity;
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;
@@ -20,15 +18,14 @@
import cn.com.basic.face.discern.query.item.CheckInQueryItem;
import cn.com.basic.face.service.DictionaryMng;
import cn.com.basic.face.service.RegisterMng;
-import cn.com.basic.face.service.VisitorTypeMng;
import cn.com.basic.face.listeners.OkButtonClickedListener;
import cn.com.basic.face.util.AppApi;
-import cn.com.basic.face.widget.BirthdayPickerDialog;
-import cn.com.basic.face.widget.CountrySelectionDialog;
+import cn.com.basic.face.dialog.BirthdayPickerDialog;
+import cn.com.basic.face.dialog.CountrySelectionDialog;
import cn.com.basic.face.widget.RegisterRightFieldLabelView;
import cn.com.basic.face.widget.RegisterRightFieldTextView;
-import cn.com.basic.face.widget.SingleSelectionDialog;
+import cn.com.basic.face.dialog.SingleSelectionDialog;
import com.facebook.drawee.view.SimpleDraweeView;
import com.lidroid.xutils.ViewUtils;
@@ -46,9 +43,6 @@
import cn.com.basic.face.discern.entity.Person;
import cn.com.basic.face.discern.entity.VisitPersonType;
-/**
- * Created by Administrator on 2017/2/20 0020.
- */
public class RegisterFragment extends BaseFragment implements View.OnClickListener{
@ViewInject(R.id.register_name)
@@ -189,19 +183,11 @@
});
}
- /**
- * 閫夋嫨浜虹墿蹇収
- * @param view
- */
@OnClick(R.id.fragment_register_choose_photo)
public void fragment_register_choose_photo_click(View view) {
Toast.makeText(getActivity(), "閫夋嫨浜虹墿蹇収", Toast.LENGTH_SHORT).show();
}
- /**
- * 鐐瑰嚮涓婁紶鍥剧墖
- * @param view
- */
@OnClick(R.id.fragment_register_update__photo)
public void fragment_register_update__photo_click(View view) {
Intent intent = new Intent();
@@ -213,6 +199,11 @@
@OnClick(R.id.fragment_register_back)
public void back(View view) {
MainActivity.selectPage(0);
+ }
+
+ @OnClick(R.id.fragment_register_idcard_photo)
+ public void identityPhoto(View view) {
+ Toast.makeText(getActivity(), "璇佷欢蹇収", Toast.LENGTH_SHORT).show();
}
public void setVisitorTypeList(List visitorTypeList) {
@@ -251,19 +242,11 @@
}
}
- /**
- * 璇佷欢蹇収
- * @param view
- */
- @OnClick(R.id.fragment_register_idcard_photo)
- public void identityPhoto(View view) {
- Toast.makeText(getActivity(), "璇佷欢蹇収", Toast.LENGTH_SHORT).show();
- }
-
@Override
public void onClick(View v) {}
public void setRegisterInfo(CheckInQueryItem item) {
fragment_register_choose_photo.setImageURI(Uri.parse(AppApi.IMAGEURL_BASE + item.getImagePath()));
}
+
}
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/MyGLSurfaceView.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/MyGLSurfaceView.java
deleted file mode 100644
index ac1d913..0000000
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/MyGLSurfaceView.java
+++ /dev/null
@@ -1,356 +0,0 @@
-/*
- * Copyright (C) 2014 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package cn.com.basic.face.widget;
-
-import android.content.Context;
-import android.graphics.SurfaceTexture;
-import android.opengl.GLES20;
-import android.opengl.GLSurfaceView;
-import android.opengl.Matrix;
-import android.os.SystemClock;
-import android.util.AttributeSet;
-import android.util.Log;
-
-import java.nio.ByteBuffer;
-import java.nio.ByteOrder;
-import java.nio.FloatBuffer;
-
-import javax.microedition.khronos.egl.EGLConfig;
-import javax.microedition.khronos.opengles.GL10;
-
-public class MyGLSurfaceView extends GLSurfaceView {
-
- MyRenderer mRenderer;
-
- public MyGLSurfaceView(Context context) {
- this(context, null);
- }
-
- public MyGLSurfaceView(Context context, AttributeSet attributeSet) {
- super(context, attributeSet);
- init();
- }
-
- private void init() {
- setEGLContextClientVersion(2);
- mRenderer = new MyRenderer();
- setRenderer(mRenderer);
- Log.i("@@@", "setrenderer");
- }
-
- @Override
- public void onPause() {
- mRenderer.onPause();
- super.onPause();
- }
-
- @Override
- public void onResume() {
- super.onResume();
- mRenderer.onResume();
- }
-
- public SurfaceTexture getSurfaceTexture() {
- return mRenderer.getSurfaceTexture();
- }
-}
-
-class MyRenderer implements GLSurfaceView.Renderer, SurfaceTexture.OnFrameAvailableListener {
-
- public MyRenderer() {
- mVertices = ByteBuffer.allocateDirect(mVerticesData.length
- * FLOAT_SIZE_BYTES).order(ByteOrder.nativeOrder()).asFloatBuffer();
- mVertices.put(mVerticesData).position(0);
-
- Matrix.setIdentityM(mSTMatrix, 0);
- }
- public void onPause() {
- }
-
- public void onResume() {
- mLastTime = SystemClock.elapsedRealtimeNanos();
- }
-
- @Override
- public void onDrawFrame(GL10 glUnused) {
- synchronized(this) {
- if (updateSurface) {
- mSurface.updateTexImage();
-
- mSurface.getTransformMatrix(mSTMatrix);
- updateSurface = false;
- }
- }
-
-
-// Logger.e("onDrawFrame");
- // Ignore the passed-in GL10 interface, and use the GLES20
- // class's static methods instead.
- GLES20.glClear( GLES20.GL_DEPTH_BUFFER_BIT | GLES20.GL_COLOR_BUFFER_BIT);
- GLES20.glUseProgram(mProgram);
- checkGlError("glUseProgram");
-
- GLES20.glActiveTexture(GLES20.GL_TEXTURE0);
- GLES20.glBindTexture(GL_TEXTURE_EXTERNAL_OES, mTextureID);
-
- mVertices.position(VERTICES_DATA_POS_OFFSET);
- GLES20.glVertexAttribPointer(maPositionHandle, 3, GLES20.GL_FLOAT, false,
- VERTICES_DATA_STRIDE_BYTES, mVertices);
- checkGlError("glVertexAttribPointer maPosition");
- GLES20.glEnableVertexAttribArray(maPositionHandle);
- checkGlError("glEnableVertexAttribArray maPositionHandle");
-
- mVertices.position(VERTICES_DATA_UV_OFFSET);
- GLES20.glVertexAttribPointer(maTextureHandle, 3, GLES20.GL_FLOAT, false,
- VERTICES_DATA_STRIDE_BYTES, mVertices);
- checkGlError("glVertexAttribPointer maTextureHandle");
- GLES20.glEnableVertexAttribArray(maTextureHandle);
- checkGlError("glEnableVertexAttribArray maTextureHandle");
-
-// long now = SystemClock.elapsedRealtimeNanos();
-// mRunTime += (now - mLastTime);
-// mLastTime = now;
-// double d = ((double)mRunTime) / 1000000000;
- Matrix.setIdentityM(mMMatrix, 0);
-// Matrix.rotateM(mMMatrix, 0, 30, (float)Math.sin(d), (float)Math.cos(d), 0); //鍔ㄦ�佺煩闃�
-// Matrix.rotateM(mMMatrix, 0, 0, 0, 0, 0);
- //Matrix.rotateM(mMMatrix, 0, 0, 0.5f, 0.5f,0);
- Matrix.multiplyMM(mMVPMatrix, 0, mVMatrix, 0, mMMatrix, 0);
- Matrix.multiplyMM(mMVPMatrix, 0, mProjMatrix, 0, mMVPMatrix, 0);
-
- GLES20.glUniformMatrix4fv(muMVPMatrixHandle, 1, false, mMVPMatrix, 0);
- GLES20.glUniformMatrix4fv(muSTMatrixHandle, 1, false, mSTMatrix, 0);
-
- GLES20.glDrawArrays(GLES20.GL_TRIANGLE_STRIP, 0, 4);
- checkGlError("glDrawArrays");
- }
-
- @Override
- public void onSurfaceChanged(GL10 glUnused, int width, int height) {
- // Ignore the passed-in GL10 interface, and use the GLES20
- // class's static methods instead.
- GLES20.glViewport(0, 0, width, height);
- mRatio = (float) width / height;
- Matrix.frustumM(mProjMatrix, 0, -mRatio, mRatio, -1, 1, 2, 7);
- }
-
- @Override
- public void onSurfaceCreated(GL10 glUnused, EGLConfig config) {
- // Ignore the passed-in GL10 interface, and use the GLES20
- // class's static methods instead.
-
- /* Set up alpha blending and an Android background color */
- GLES20.glEnable(GLES20.GL_BLEND);
- GLES20.glBlendFunc(GLES20.GL_SRC_ALPHA, GLES20.GL_ONE_MINUS_SRC_ALPHA);
- GLES20.glClearColor(0.643f, 0.776f, 0.223f, 1.0f);
-
- /* Set up shaders and handles to their variables */
- mProgram = createProgram(mVertexShader, mFragmentShader);
- if (mProgram == 0) {
- return;
- }
- maPositionHandle = GLES20.glGetAttribLocation(mProgram, "aPosition");
- checkGlError("glGetAttribLocation aPosition");
- if (maPositionHandle == -1) {
- throw new RuntimeException("Could not get attrib location for aPosition");
- }
- maTextureHandle = GLES20.glGetAttribLocation(mProgram, "aTextureCoord");
- checkGlError("glGetAttribLocation aTextureCoord");
- if (maTextureHandle == -1) {
- throw new RuntimeException("Could not get attrib location for aTextureCoord");
- }
-
- muMVPMatrixHandle = GLES20.glGetUniformLocation(mProgram, "uMVPMatrix");
- checkGlError("glGetUniformLocation uMVPMatrix");
- if (muMVPMatrixHandle == -1) {
- throw new RuntimeException("Could not get attrib location for uMVPMatrix");
- }
-
- muSTMatrixHandle = GLES20.glGetUniformLocation(mProgram, "uSTMatrix");
- checkGlError("glGetUniformLocation uSTMatrix");
- if (muSTMatrixHandle == -1) {
- throw new RuntimeException("Could not get attrib location for uSTMatrix");
- }
-
- /*
- * Create our texture. This has to be done each time the
- * surface is created.
- */
-
- int[] textures = new int[1];
- GLES20.glGenTextures(1, textures, 0);
-
- mTextureID = textures[0];
- GLES20.glBindTexture(GL_TEXTURE_EXTERNAL_OES, mTextureID);
- checkGlError("glBindTexture mTextureID");
-
- // Can't do mipmapping with camera source
- GLES20.glTexParameterf(GL_TEXTURE_EXTERNAL_OES, GLES20.GL_TEXTURE_MIN_FILTER,
- GLES20.GL_NEAREST);
- GLES20.glTexParameterf(GL_TEXTURE_EXTERNAL_OES, GLES20.GL_TEXTURE_MAG_FILTER,
- GLES20.GL_LINEAR);
- // Clamp to edge is the only option
- GLES20.glTexParameteri(GL_TEXTURE_EXTERNAL_OES, GLES20.GL_TEXTURE_WRAP_S,
- GLES20.GL_CLAMP_TO_EDGE);
- GLES20.glTexParameteri(GL_TEXTURE_EXTERNAL_OES, GLES20.GL_TEXTURE_WRAP_T,
- GLES20.GL_CLAMP_TO_EDGE);
- checkGlError("glTexParameteri mTextureID");
-
- /*
- * Create the SurfaceTexture that will feed this textureID, and pass it to the camera
- */
-
- mSurface = new SurfaceTexture(mTextureID);
- mSurface.setOnFrameAvailableListener(this);
-
- Matrix.setLookAtM(mVMatrix, 0,
- 0, 0, 2f,
- 0f, 0f, 0f,
- 0f, 1.0f, 0.0f);
-
- synchronized(this) {
- updateSurface = false;
- }
- }
-
- @Override
- synchronized public void onFrameAvailable(SurfaceTexture surface) {
- /* For simplicity, SurfaceTexture calls here when it has new
- * data available. Call may come in from some random thread,
- * so let's be safe and use synchronize. No OpenGL calls can be done here.
- */
- updateSurface = true;
- //Log.v(TAG, "onFrameAvailable " + surface.getTimestamp());
- }
-
- private int loadShader(int shaderType, String source) {
- int shader = GLES20.glCreateShader(shaderType);
- if (shader != 0) {
- GLES20.glShaderSource(shader, source);
- GLES20.glCompileShader(shader);
- int[] compiled = new int[1];
- GLES20.glGetShaderiv(shader, GLES20.GL_COMPILE_STATUS, compiled, 0);
- if (compiled[0] == 0) {
- Log.e(TAG, "Could not compile shader " + shaderType + ":");
- Log.e(TAG, GLES20.glGetShaderInfoLog(shader));
- GLES20.glDeleteShader(shader);
- shader = 0;
- }
- }
- return shader;
- }
-
- private int createProgram(String vertexSource, String fragmentSource) {
- int vertexShader = loadShader(GLES20.GL_VERTEX_SHADER, vertexSource);
- if (vertexShader == 0) {
- return 0;
- }
- int pixelShader = loadShader(GLES20.GL_FRAGMENT_SHADER, fragmentSource);
- if (pixelShader == 0) {
- return 0;
- }
-
- int program = GLES20.glCreateProgram();
- if (program != 0) {
- GLES20.glAttachShader(program, vertexShader);
- checkGlError("glAttachShader");
- GLES20.glAttachShader(program, pixelShader);
- checkGlError("glAttachShader");
- GLES20.glLinkProgram(program);
- int[] linkStatus = new int[1];
- GLES20.glGetProgramiv(program, GLES20.GL_LINK_STATUS, linkStatus, 0);
- if (linkStatus[0] != GLES20.GL_TRUE) {
- Log.e(TAG, "Could not link program: ");
- Log.e(TAG, GLES20.glGetProgramInfoLog(program));
- GLES20.glDeleteProgram(program);
- program = 0;
- }
- }
- return program;
- }
-
- private void checkGlError(String op) {
- int error;
- while ((error = GLES20.glGetError()) != GLES20.GL_NO_ERROR) {
- Log.e(TAG, op + ": glError " + error);
- throw new RuntimeException(op + ": glError " + error);
- }
- }
-
- private static final int FLOAT_SIZE_BYTES = 4;
- private static final int VERTICES_DATA_STRIDE_BYTES = 5 * FLOAT_SIZE_BYTES;
- private static final int VERTICES_DATA_POS_OFFSET = 0;
- private static final int VERTICES_DATA_UV_OFFSET = 3;
- private final float[] mVerticesData = {
- // X, Y, Z, U, V
- -1.25f, -1.0f, 0, 0.f, 0.f,
- 1.25f, -1.0f, 0, 1.f, 0.f,
- -1.25f, 1.0f, 0, 0.f, 1.f,
- 1.25f, 1.0f, 0, 1.f, 1.f,
- };
-
- private FloatBuffer mVertices;
-
- private final String mVertexShader =
- "uniform mat4 uMVPMatrix;\n" +
- "uniform mat4 uSTMatrix;\n" +
- "attribute vec4 aPosition;\n" +
- "attribute vec4 aTextureCoord;\n" +
- "varying vec2 vTextureCoord;\n" +
- "void main() {\n" +
- " gl_Position = uMVPMatrix * aPosition;\n" +
- " vTextureCoord = (uSTMatrix * aTextureCoord).xy;\n" +
- "}\n";
-
- private final String mFragmentShader =
- "#extension GL_OES_EGL_image_external : require\n" +
- "precision mediump float;\n" +
- "varying vec2 vTextureCoord;\n" +
- "uniform samplerExternalOES sTexture;\n" +
- "void main() {\n" +
- " gl_FragColor = texture2D(sTexture, vTextureCoord);\n" +
- "}\n";
-
- private float[] mMVPMatrix = new float[16];
- private float[] mProjMatrix = new float[16];
- private float[] mMMatrix = new float[16];// 鍏蜂綋鐗╀綋鐨�3D鍙樻崲鐭╅樀锛屽寘鎷棆杞�佸钩绉汇�佺缉鏀�
-
- private float[] mVMatrix = new float[16];
- private float[] mSTMatrix = new float[16];
-
- private int mProgram;
- private int mTextureID;
- private int muMVPMatrixHandle;
- private int muSTMatrixHandle;
- private int maPositionHandle;
- private int maTextureHandle;
-
- private float mRatio = 1.0f;
- private SurfaceTexture mSurface;
- private boolean updateSurface = false;
- private long mLastTime = -1;
- private long mRunTime = 0;
-
- private static final String TAG = "MyRenderer";
-
- // Magic key
- private static final int GL_TEXTURE_EXTERNAL_OES = 0x8D65;
-
- public SurfaceTexture getSurfaceTexture() {
- return mSurface;
- }
-}
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/SearchEditText.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/SearchEditText.java
index 2069a47..de0c346 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/SearchEditText.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/SearchEditText.java
@@ -5,10 +5,6 @@
import android.view.KeyEvent;
import android.widget.EditText;
-/**
- * Created by xiuxi on 2017/3/29.
- */
-
public class SearchEditText extends EditText {
public SearchEditText(Context context) {
super(context);
@@ -19,8 +15,7 @@
}
@Override
- public boolean onKeyDown(int keyCode, KeyEvent event)
- {
+ public boolean onKeyDown(int keyCode, KeyEvent event) {
if (keyCode==KeyEvent.KEYCODE_ENTER) {
return true;
}
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/SupervisoryBottomListView.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/SupervisoryBottomListView.java
index 1080e2f..34732ec 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/SupervisoryBottomListView.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/SupervisoryBottomListView.java
@@ -13,15 +13,9 @@
import java.util.ArrayList;
import java.util.List;
-import cn.com.basic.face.adapter.CheckInLeftListViewAdapter;
import cn.com.basic.face.adapter.SupervisoryBottomListViewAdapter;
import cn.com.basic.face.base.MainActivity;
-import cn.com.basic.face.util.Constant;
import cn.com.basic.face.util.WindowsUtil;
-
-/**
- * Created by xiuxi on 2017/3/31.
- */
public class SupervisoryBottomListView extends EasyRecyclerView {
@@ -73,7 +67,6 @@
}
public void show(List list, boolean isVisitorList) {
- //mAdapter.setRowType(isVisitorList? Constant.CheckIn.VISITOR_ROW:Constant.CheckIn.INTERVIEWEE_ROW);
refresh(list);
}
--
Gitblit v1.8.0