From a2df837618f1ef81b7198851ac5bd0608c116ce3 Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期四, 30 三月 2017 15:59:31 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/AttendanceFragment.java | 8
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/base/BaseFragment.java | 3
/dev/null | 40 ------
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/PhoneCallFragment.java | 8
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/base/LeftRightBaseFragment.java | 72 ++++++++++++
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/SupervisoryFragment.java | 125 ++++++++++----------
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/CheckInFragment.java | 50 +++----
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/DeviceFragment.java | 6
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/VisitFragment.java | 6
9 files changed, 173 insertions(+), 145 deletions(-)
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/base/BaseFragment.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/base/BaseFragment.java
index e53f50b..511bcb2 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/base/BaseFragment.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/base/BaseFragment.java
@@ -9,6 +9,8 @@
import android.view.View;
import android.view.ViewGroup;
+import com.lidroid.xutils.ViewUtils;
+
/**
* Created by zhangbo on 2017/2/15.
*/
@@ -30,6 +32,7 @@
ViewGroup parent = (ViewGroup) this.view.getParent();
parent.removeView(this.view);
}
+ ViewUtils.inject(this, this.view);
this.initViews(this.view, savedInstanceState);
this.initToolbar(savedInstanceState);
this.initListeners();
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/base/LeftRightBaseFragment.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/base/LeftRightBaseFragment.java
new file mode 100644
index 0000000..26da1bb
--- /dev/null
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/base/LeftRightBaseFragment.java
@@ -0,0 +1,72 @@
+package cn.com.basic.face.base;
+
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.FrameLayout;
+
+import com.bsk.zhangbo.demoforbsk.R;
+import com.lidroid.xutils.ViewUtils;
+
+/**
+ * Created by Administrator on 2017/2/20 0020.
+ */
+
+public abstract class LeftRightBaseFragment extends BaseFragment{
+ private View frameView;
+
+ private View leftView;
+ private View rightView;
+
+ public View getLeftView() {
+ return leftView;
+ }
+
+ public View getRightView() {
+ return rightView;
+ }
+
+ public View getFrameView() {
+ return frameView;
+ }
+
+ @Override
+ protected void initViews(View view, Bundle savedInstanceState) {
+ this.frameView = view;
+ FrameLayout rightFrameLayout = (FrameLayout) this.frameView.findViewById(R.id.fragment_left_right_frame_layout_right);
+ FrameLayout leftFrameLayout = (FrameLayout) this.frameView.findViewById(R.id.fragment_left_right_frame_layout_left);
+
+ if (getLeftRightLayoutIds() != null && getLeftRightLayoutIds().length == 2) {
+ leftView = LayoutInflater.from(getActivity()).inflate(getLeftRightLayoutIds()[0],null);
+ ViewUtils.inject(this, leftView);
+ leftFrameLayout.addView(leftView);
+
+ rightView = LayoutInflater.from(getActivity()).inflate(getLeftRightLayoutIds()[1],null);
+ ViewUtils.inject(this, rightView);
+ rightFrameLayout.addView(rightView);
+ }
+ addLeftLayout();
+ addRightLayout();
+ }
+
+ public int[] getLeftRightLayoutIds() {
+ return null;
+ }
+
+ @Override
+ protected int getLayoutId() {
+ return R.layout.fragment_left_right_frame_layout;
+ }
+
+ @Override
+ protected void initToolbar(Bundle savedInstanceState) {
+
+ }
+ public View addLeftLayout() {
+ return null;
+ }
+
+ public View addRightLayout() {
+ return null;
+ }
+}
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/base/MainUIBaseFragment.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/base/MainUIBaseFragment.java
deleted file mode 100644
index 0ceb7cc..0000000
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/base/MainUIBaseFragment.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package cn.com.basic.face.base;
-
-import android.os.Bundle;
-import android.view.View;
-import android.widget.FrameLayout;
-
-import com.bsk.zhangbo.demoforbsk.R;
-
-/**
- * Created by Administrator on 2017/2/20 0020.
- */
-
-public abstract class MainUIBaseFragment extends BaseFragment{
- private View view;
- @Override
- protected void initViews(View view, Bundle savedInstanceState) {
- this.view = view;
- FrameLayout right = (FrameLayout) this.view.findViewById(R.id.fragment_left_right_frame_layout_right);
- FrameLayout left = (FrameLayout) this.view.findViewById(R.id.fragment_left_right_frame_layout_left);
- if (addLeftLayout() != null ){
- left.addView(addLeftLayout());
- }
- if (addRightLayout() != null ){
- right.addView(addRightLayout());
- }
- }
-
- @Override
- protected int getLayoutId() {
- return R.layout.fragment_left_right_frame_layout;
- }
-
- @Override
- protected void initToolbar(Bundle savedInstanceState) {
-
- }
-
- public abstract View addLeftLayout();
- public abstract View addRightLayout() ;
-}
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/AttendanceFragment.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/AttendanceFragment.java
index dec1439..650655c 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/AttendanceFragment.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/AttendanceFragment.java
@@ -8,7 +8,7 @@
import com.bsk.zhangbo.demoforbsk.R;
import cn.com.basic.face.adapter.AttendanceAdapter;
import cn.com.basic.face.adapter.VisitAdapter;
-import cn.com.basic.face.base.MainUIBaseFragment;
+import cn.com.basic.face.base.LeftRightBaseFragment;
import cn.com.basic.face.base.MainActivity;
import com.camnter.easyrecyclerview.holder.EasyRecyclerViewHolder;
@@ -23,7 +23,7 @@
* Created by Sinoe on 2017/2/23.
*/
-public class AttendanceFragment extends MainUIBaseFragment implements EasyRecyclerViewHolder.OnItemClickListener{
+public class AttendanceFragment extends LeftRightBaseFragment implements EasyRecyclerViewHolder.OnItemClickListener{
private View mViewLeft,mViewRight;
private EasyRecyclerView mRightRecyclerView,mLeftRecyclerView;
private AttendanceAdapter mRightAdapter;
@@ -31,7 +31,7 @@
public static AttendanceFragment newInstance(){
return new AttendanceFragment();
}
- @Override
+
public View addLeftLayout() {
mViewLeft = LayoutInflater.from(getActivity()).inflate(R.layout.fragment_attendance_left, null);
mLeftRecyclerView = (EasyRecyclerView) mViewLeft.findViewById(R.id.visitor_manager_recycler);
@@ -42,7 +42,7 @@
return mViewLeft;
}
- @Override
+
public View addRightLayout() {
mViewRight = LayoutInflater.from(getActivity()).inflate(R.layout.fragment_attendance_right, null);
mRightRecyclerView = (EasyRecyclerView) mViewRight.findViewById(R.id.attendance_recycler);
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 e6a6c5b..2c078f7 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
@@ -3,7 +3,6 @@
import android.text.Editable;
import android.text.TextWatcher;
import android.view.Gravity;
-import android.view.LayoutInflater;
import android.view.View;
import android.widget.EditText;
import android.widget.LinearLayout;
@@ -13,7 +12,7 @@
import com.bsk.zhangbo.demoforbsk.R;
-import cn.com.basic.face.base.MainUIBaseFragment;
+import cn.com.basic.face.base.LeftRightBaseFragment;
import cn.com.basic.face.listeners.OkButtonClickedListener;
import cn.com.basic.face.service.DictionaryMng;
import cn.com.basic.face.service.CheckInMng;
@@ -23,7 +22,6 @@
import cn.com.basic.face.widget.CheckInRightVisitorCell;
import cn.com.basic.face.widget.VisitReasonDialog;
-import com.lidroid.xutils.ViewUtils;
import com.lidroid.xutils.view.annotation.ViewInject;
import com.lidroid.xutils.view.annotation.event.OnClick;
@@ -36,7 +34,7 @@
import cn.com.basic.face.discern.entity.Visit;
import cn.com.basic.face.discern.query.item.CheckInQueryItem;
-public class CheckInFragment extends MainUIBaseFragment {
+public class CheckInFragment extends LeftRightBaseFragment {
private static CheckInFragment instance = new CheckInFragment();
public static CheckInFragment getInstance() {
@@ -72,25 +70,29 @@
private List<String> visitPurposeList = new ArrayList<String>();
@Override
- public View addLeftLayout() {
- fragment_check_in_left = LayoutInflater.from(getActivity()).inflate(R.layout.fragment_check_in_left,null);
- ViewUtils.inject(this, fragment_check_in_left);
+ public int[] getLeftRightLayoutIds() {
+ return new int[]{R.layout.fragment_check_in_left, R.layout.fragment_check_in_right};
+ }
- ((RadioGroup)fragment_check_in_left.findViewById(R.id.fragment_check_in_left_radio_group))
- .setOnCheckedChangeListener(new RadioGroup.OnCheckedChangeListener() {
- @Override
- public void onCheckedChanged(RadioGroup radioGroup, int i) {
- reloadCheckInLeftList();
- }
- });
+ @Override
+ protected void initListeners() {
+ super.initListeners();
- ((RadioGroup)fragment_check_in_left.findViewById(R.id.fragment_check_in_left_sort_radio_group))
+ ((RadioGroup)getLeftView().findViewById(R.id.fragment_check_in_left_radio_group))
.setOnCheckedChangeListener(new RadioGroup.OnCheckedChangeListener() {
- @Override
- public void onCheckedChanged(RadioGroup radioGroup, int i) {
- reloadCheckInLeftList();
- }
- });
+ @Override
+ public void onCheckedChanged(RadioGroup radioGroup, int i) {
+ reloadCheckInLeftList();
+ }
+ });
+
+ ((RadioGroup)getLeftView().findViewById(R.id.fragment_check_in_left_sort_radio_group))
+ .setOnCheckedChangeListener(new RadioGroup.OnCheckedChangeListener() {
+ @Override
+ public void onCheckedChanged(RadioGroup radioGroup, int i) {
+ reloadCheckInLeftList();
+ }
+ });
fragment_check_in_left_search_edit_text.addTextChangedListener(new TextWatcher() {
public void beforeTextChanged(CharSequence charSequence, int i, int i1, int i2) {}
@@ -98,14 +100,6 @@
public void afterTextChanged(Editable editable) { reloadCheckInLeftList(); }
});
- return fragment_check_in_left;
- }
-
- @Override
- public View addRightLayout() {
- fragment_check_in_right = LayoutInflater.from(getActivity()).inflate(R.layout.fragment_check_in_right,null);
- ViewUtils.inject(this, fragment_check_in_right);
- return fragment_check_in_right;
}
private void reloadCheckInLeftList() {
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/DeviceFragment.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/DeviceFragment.java
index 55f9355..c5be749 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/DeviceFragment.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/DeviceFragment.java
@@ -7,7 +7,7 @@
import android.widget.TextView;
import com.bsk.zhangbo.demoforbsk.R;
-import cn.com.basic.face.base.MainUIBaseFragment;
+import cn.com.basic.face.base.LeftRightBaseFragment;
import cn.com.basic.face.base.MainActivity;
import com.lidroid.xutils.ViewUtils;
@@ -20,7 +20,7 @@
* Created by Sinoe on 2017/2/23.
*/
-public class DeviceFragment extends MainUIBaseFragment implements View.OnClickListener{
+public class DeviceFragment extends LeftRightBaseFragment implements View.OnClickListener{
private View mViewLeft,mViewRight;
private RelativeLayout mLayoutWifi,mLayoutLandline,mLayoutSchool,mLayoutCamera1,mLayoutCamera2;
private TextView mTvWifi,mTvLandline,mTvSchool,mTvCamera1,mTvCamera2;
@@ -30,7 +30,6 @@
return new DeviceFragment();
}
- @Override
public View addLeftLayout() {
mViewLeft = LayoutInflater.from(getActivity()).inflate(R.layout.fragment_device_left,null);
mLayoutWifi = (RelativeLayout) mViewLeft.findViewById(R.id.device_wifi);
@@ -63,7 +62,6 @@
return mViewLeft;
}
- @Override
public View addRightLayout() {
mViewRight = LayoutInflater.from(getActivity()).inflate(R.layout.fragment_device_right,null);
return mViewRight;
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/PhoneCallFragment.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/PhoneCallFragment.java
index 3fc0003..08b2a8f 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/PhoneCallFragment.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/PhoneCallFragment.java
@@ -9,7 +9,7 @@
import com.bsk.zhangbo.demoforbsk.R;
import cn.com.basic.face.adapter.CheckInLeftListViewAdapter;
-import cn.com.basic.face.base.MainUIBaseFragment;
+import cn.com.basic.face.base.LeftRightBaseFragment;
import cn.com.basic.face.base.MainActivity;
import cn.com.basic.face.util.Constant;
import cn.com.basic.face.widget.CheckInIntervieweeCell;
@@ -24,7 +24,7 @@
* Created by Sinoe on 2017/2/23.
*/
-public class PhoneCallFragment extends MainUIBaseFragment {
+public class PhoneCallFragment extends LeftRightBaseFragment {
private View mViewLeft,mViewRight;
@@ -38,7 +38,7 @@
public static PhoneCallFragment newInstance() {
return new PhoneCallFragment();
}
- @Override
+
public View addLeftLayout() {
mViewLeft = LayoutInflater.from(getActivity()).inflate(R.layout.fragment_phone_call_left,null);
@@ -60,7 +60,7 @@
return mViewLeft;
}
- @Override
+
public View addRightLayout() {
mViewRight = LayoutInflater.from(getActivity()).inflate(R.layout.fragment_phone_call_right,null);
mVisitorTo = (CheckInIntervieweeCell) mViewRight.findViewById(R.id.tel_phone_to);
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/SupervisoryFragment.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/SupervisoryFragment.java
index d510248..b50817e 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/SupervisoryFragment.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/SupervisoryFragment.java
@@ -22,6 +22,7 @@
import cn.com.basic.face.util.WindowsUtil;
import cn.com.basic.face.widget.MyGLSurfaceView;
import com.camnter.easyrecyclerview.widget.EasyRecyclerView;
+import com.lidroid.xutils.view.annotation.ViewInject;
import com.orhanobut.logger.Logger;
import java.util.ArrayList;
@@ -34,19 +35,34 @@
public class SupervisoryFragment extends BaseFragment {
- private RadioGroup mRadioGroup;
- private RadioButton mRadioButton1, mRadioButton2;
- private View mRadioLine1, mRadioLine2;
+ static {
+ //System.loadLibrary("rtspface");//xiuxi
+ }
+
+ @ViewInject(R.id.fragment_supervisory_bottom_left_radio_group)
+ private RadioGroup fragment_supervisory_bottom_left_radio_group;
+ @ViewInject(R.id.fragment_supervisory_bottom_visitor_radio_button)
+ private RadioButton fragment_supervisory_bottom_visitor_radio_button;
+ @ViewInject(R.id.fragment_supervisory_bottom_attendance_radio_button)
+ private RadioButton fragment_supervisory_bottom_attendance_radio_button;
+ @ViewInject(R.id.fragment_supervisory_bottom_visitor_background)
+ private View fragment_supervisory_bottom_visitor_background;
+ @ViewInject(R.id.fragment_supervisory_bottom_attendance_background)
+ private View fragment_supervisory_bottom_attendance_background;
+ @ViewInject(R.id.fragment_supervisory_bottom_register_list)
+ private EasyRecyclerView fragment_supervisory_bottom_register_list;
+ @ViewInject(R.id.fragment_supervisory_bottom_visitor_list)
+ private EasyRecyclerView fragment_supervisory_bottom_visitor_list;
+
private SupervisoryAdapter mAdapter;
private List mList;
- private EasyRecyclerView mRecyclerViewRegister, mRecyclerViewUser;
//鎾斁
String mSourceString = "clips/testfile.mp4";
- SurfaceView mSurfaceView1;
- SurfaceView mSurfaceView2;
+ SurfaceView fragment_supervisory_enter_camera;
+ SurfaceView fragment_supervisory_exit_camera;
SurfaceHolder mSurfaceHolder1;
VideoSink mSelectedVideoSink;
@@ -59,10 +75,7 @@
boolean mCreated = false;
boolean mIsPlaying = false;
- /** Load jni .so on initialization */
- static {
- //System.loadLibrary("rtspface");//xiuxi
- }
+
private static SupervisoryFragment instance = new SupervisoryFragment();
@@ -78,28 +91,28 @@
@Override
protected void initViews(View view, Bundle savedInstanceState) {
- mRadioGroup = (RadioGroup) view.findViewById(R.id.fragment_supervisory_bottom_left_radio_group);
- mRadioButton1 = (RadioButton) view.findViewById(R.id.fragment_supervisory_bottom_visitor_radio_button);
- mRadioButton2 = (RadioButton) view.findViewById(R.id.fragment_supervisory_bottom_attendance_radio_button);
- mRadioLine1 = view.findViewById(R.id.fragment_supervisory_bottom_visitor_background);
- mRadioLine2 = view.findViewById(R.id.fragment_supervisory_bottom_attendance_background);
- mRecyclerViewRegister = (EasyRecyclerView) view.findViewById(R.id.fragment_supervisory_bottom_register_list);
- mRecyclerViewUser = (EasyRecyclerView) view.findViewById(R.id.fragment_supervisory_bottom_visitor_list);
- mRadioButton1.setChecked(true);
- mRecyclerViewRegister.addItemDecoration(new SpaceItemDecoration());
+ fragment_supervisory_bottom_left_radio_group = (RadioGroup) view.findViewById(R.id.fragment_supervisory_bottom_left_radio_group);
+ fragment_supervisory_bottom_visitor_radio_button = (RadioButton) view.findViewById(R.id.fragment_supervisory_bottom_visitor_radio_button);
+ fragment_supervisory_bottom_attendance_radio_button = (RadioButton) view.findViewById(R.id.fragment_supervisory_bottom_attendance_radio_button);
+ fragment_supervisory_bottom_visitor_background = view.findViewById(R.id.fragment_supervisory_bottom_visitor_background);
+ fragment_supervisory_bottom_attendance_background = view.findViewById(R.id.fragment_supervisory_bottom_attendance_background);
+ fragment_supervisory_bottom_register_list = (EasyRecyclerView) view.findViewById(R.id.fragment_supervisory_bottom_register_list);
+ fragment_supervisory_bottom_visitor_list = (EasyRecyclerView) view.findViewById(R.id.fragment_supervisory_bottom_visitor_list);
+ fragment_supervisory_bottom_visitor_radio_button.setChecked(true);
+ fragment_supervisory_bottom_register_list.addItemDecoration(new SpaceItemDecoration());
GridLayoutManager gridLayoutManager = new GridLayoutManager(getActivity(), 2);
gridLayoutManager.setOrientation(LinearLayoutManager.HORIZONTAL);
- mRecyclerViewRegister.setLayoutManager(gridLayoutManager);
+ fragment_supervisory_bottom_register_list.setLayoutManager(gridLayoutManager);
mAdapter = new SupervisoryAdapter(getActivity());
- mSurfaceView2 = (SurfaceView) view.findViewById(R.id.fragment_supervisory_exit_camera);
- mSurfaceView1 = (SurfaceView) view.findViewById(R.id.fragment_supervisory_enter_camera);
+ fragment_supervisory_exit_camera = (SurfaceView) view.findViewById(R.id.fragment_supervisory_exit_camera);
+ fragment_supervisory_enter_camera = (SurfaceView) view.findViewById(R.id.fragment_supervisory_enter_camera);
RtspFaceNative.init();
- RtspFaceNative.setSurface(1, mSurfaceView1.getHolder().getSurface());
- RtspFaceNative.setSurface(2, mSurfaceView2.getHolder().getSurface());
+ RtspFaceNative.setSurface(1, fragment_supervisory_enter_camera.getHolder().getSurface());
+ RtspFaceNative.setSurface(2, fragment_supervisory_exit_camera.getHolder().getSurface());
- mSurfaceHolder1 = mSurfaceView1.getHolder();
+ mSurfaceHolder1 = fragment_supervisory_enter_camera.getHolder();
mSurfaceHolder1.addCallback(new SurfaceHolder.Callback() {
@@ -128,11 +141,11 @@
//openGL
- if(mSurfaceView2 instanceof MyGLSurfaceView) {
- ((MyGLSurfaceView)mSurfaceView2).onResume();
+ if(fragment_supervisory_exit_camera instanceof MyGLSurfaceView) {
+ ((MyGLSurfaceView) fragment_supervisory_exit_camera).onResume();
}
if (mGLView1VideoSink == null) {
- mGLView1VideoSink = new GLViewVideoSink(mSurfaceView2);
+ mGLView1VideoSink = new GLViewVideoSink(fragment_supervisory_exit_camera);
}
mSelectedVideoSink = mGLView1VideoSink;
@@ -167,7 +180,6 @@
//setPlayingStreamingMediaPlayer(mIsPlaying);
}
-
} catch (InterruptedException e) {
e.printStackTrace();
}
@@ -178,21 +190,21 @@
@Override
protected void initListeners() {
- mRadioGroup.setOnCheckedChangeListener(new RadioGroup.OnCheckedChangeListener() {
+ fragment_supervisory_bottom_left_radio_group.setOnCheckedChangeListener(new RadioGroup.OnCheckedChangeListener() {
@Override
public void onCheckedChanged(RadioGroup group, int checkedId) {
switch (checkedId) {
case R.id.fragment_supervisory_bottom_visitor_radio_button:
- mRadioLine1.setVisibility(View.VISIBLE);
- mRadioLine2.setVisibility(View.INVISIBLE);
- mRecyclerViewRegister.setVisibility(View.VISIBLE);
- mRecyclerViewUser.setVisibility(View.GONE);
+ fragment_supervisory_bottom_visitor_background.setVisibility(View.VISIBLE);
+ fragment_supervisory_bottom_attendance_background.setVisibility(View.INVISIBLE);
+ fragment_supervisory_bottom_register_list.setVisibility(View.VISIBLE);
+ fragment_supervisory_bottom_visitor_list.setVisibility(View.GONE);
break;
case R.id.fragment_supervisory_bottom_attendance_radio_button:
- mRadioLine1.setVisibility(View.INVISIBLE);
- mRadioLine2.setVisibility(View.VISIBLE);
- mRecyclerViewRegister.setVisibility(View.GONE);
- mRecyclerViewUser.setVisibility(View.VISIBLE);
+ fragment_supervisory_bottom_visitor_background.setVisibility(View.INVISIBLE);
+ fragment_supervisory_bottom_attendance_background.setVisibility(View.VISIBLE);
+ fragment_supervisory_bottom_register_list.setVisibility(View.GONE);
+ fragment_supervisory_bottom_visitor_list.setVisibility(View.VISIBLE);
break;
}
}
@@ -200,28 +212,19 @@
}
@Override
- protected void initData() {
-// switchSurface();
+ public void setMenuVisibility(boolean menuVisible) {
+ super.setMenuVisibility(menuVisible);
+ if (menuVisible) {
+// reloadBottomList();
+ }
+ }
+
+ private void reloadBottomList() {
mList = new ArrayList();
-// for (int i = 0; i < 125; i++) {
-// FacePhotoItem item = new FacePhotoItem();
-// //item.setType();
-// item.setName("寮犱笁"+i);
-// if (i % 3 == 0) {
-// item.setStatus("鏉ヨ鐧昏");
-// } else {
-// item.setStatus("绛剧");
-// }
-// if (i % 5 == 0) {
-// item.setWarning("");
-// } else {
-// item.setWarning("璀﹀憡");
-// }
-// mList.add(item);
-// }
CheckInMng.getInstance().findVisitorList();
+ mAdapter = new SupervisoryAdapter(getActivity());
mAdapter.setList(mList);
- mRecyclerViewRegister.setAdapter(mAdapter);
+ fragment_supervisory_bottom_register_list.setAdapter(mAdapter);
}
private class SpaceItemDecoration extends RecyclerView.ItemDecoration {
@@ -265,8 +268,8 @@
@Override
public void onPause() {
mIsPlaying = false;
- if(mSurfaceView2 instanceof MyGLSurfaceView) {
- ((MyGLSurfaceView)mSurfaceView2).onPause();
+ if(fragment_supervisory_exit_camera instanceof MyGLSurfaceView) {
+ ((MyGLSurfaceView) fragment_supervisory_exit_camera).onPause();
}
//setPlayingStreamingMediaPlayer(false);//xiuxi
super.onPause();
@@ -275,8 +278,8 @@
@Override
public void onResume() {
super.onResume();
- if(mSurfaceView2 instanceof MyGLSurfaceView) {
- ((MyGLSurfaceView)mSurfaceView2).onResume();
+ if(fragment_supervisory_exit_camera instanceof MyGLSurfaceView) {
+ ((MyGLSurfaceView) fragment_supervisory_exit_camera).onResume();
}
}
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/VisitFragment.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/VisitFragment.java
index e385c84..f339525 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/VisitFragment.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/VisitFragment.java
@@ -9,7 +9,7 @@
import com.bsk.zhangbo.demoforbsk.R;
import cn.com.basic.face.adapter.VisitAdapter;
-import cn.com.basic.face.base.MainUIBaseFragment;
+import cn.com.basic.face.base.LeftRightBaseFragment;
import cn.com.basic.face.base.MainActivity;
import com.camnter.easyrecyclerview.holder.EasyRecyclerViewHolder;
@@ -24,7 +24,7 @@
* Created by Sinoe on 2017/2/23.
*/
-public class VisitFragment extends MainUIBaseFragment implements EasyRecyclerViewHolder.OnItemClickListener{
+public class VisitFragment extends LeftRightBaseFragment implements EasyRecyclerViewHolder.OnItemClickListener{
private View mViewLeft,mViewRight;
private LinearLayout mRowLayout1,mRowLayout2,mRowLayout3,mRowLayout4,mRowLayout5,mRowLayout6,mRowLayout7;
private TextView mRow1TextViewLeft,mRow1TextViewRight,mRow2TextViewLeft,mRow2TextViewRight,mRow3TextViewLeft,mRow3TextViewRight,mRow4TextViewLeft,mRow4TextViewRight,
@@ -36,7 +36,6 @@
return new VisitFragment();
}
- @Override
public View addLeftLayout() {
mViewLeft = LayoutInflater.from(getActivity()).inflate(R.layout.fragment_visit_left,null);
mRecyclerView = (EasyRecyclerView) mViewLeft.findViewById(R.id.visitor_manager_recycler);
@@ -47,7 +46,6 @@
return mViewLeft;
}
- @Override
public View addRightLayout() {
mViewRight = LayoutInflater.from(getActivity()).inflate(R.layout.fragment_visit_right,null);
mRowLayout1 = (LinearLayout) mViewRight.findViewById(R.id.visitor_manager_row1);
--
Gitblit v1.8.0