From 6e7ddb293e678d50c8ce2bd186f5630b81795237 Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期四, 30 三月 2017 15:18:54 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/SupervisoryFragment.java | 18 +++++++++---------
VisitFace/DemoForBsk/app/src/main/res/layout/fragment_supervisory.xml | 14 +++++++-------
2 files changed, 16 insertions(+), 16 deletions(-)
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 3aa1440..05b8b80 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
@@ -78,11 +78,11 @@
@Override
protected void initViews(View view, Bundle savedInstanceState) {
- mRadioGroup = (RadioGroup) view.findViewById(R.id.radio_group);
- mRadioButton1 = (RadioButton) view.findViewById(R.id.radio1);
- mRadioButton2 = (RadioButton) view.findViewById(R.id.radio2);
- mRadioLine1 = view.findViewById(R.id.radio_line1);
- mRadioLine2 = view.findViewById(R.id.radio_line2);
+ 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.recyclerview_register);
mRecyclerViewUser = (EasyRecyclerView) view.findViewById(R.id.recyclerview_user);
mRadioButton1.setChecked(true);
@@ -93,8 +93,8 @@
mAdapter = new SupervisoryAdapter(getActivity());
- mSurfaceView2 = (SurfaceView) view.findViewById(R.id.surfaceview2);
- mSurfaceView1 = (SurfaceView) view.findViewById(R.id.surfaceview1);
+ mSurfaceView2 = (SurfaceView) view.findViewById(R.id.fragment_supervisory_exit_camera);
+ mSurfaceView1 = (SurfaceView) view.findViewById(R.id.fragment_supervisory_enter_camera);
RtspFaceNative.init();
RtspFaceNative.setSurface(1, mSurfaceView1.getHolder().getSurface());
RtspFaceNative.setSurface(2, mSurfaceView2.getHolder().getSurface());
@@ -182,13 +182,13 @@
@Override
public void onCheckedChanged(RadioGroup group, int checkedId) {
switch (checkedId) {
- case R.id.radio1:
+ 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);
break;
- case R.id.radio2:
+ case R.id.fragment_supervisory_bottom_attendance_radio_button:
mRadioLine1.setVisibility(View.INVISIBLE);
mRadioLine2.setVisibility(View.VISIBLE);
mRecyclerViewRegister.setVisibility(View.GONE);
diff --git a/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_supervisory.xml b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_supervisory.xml
index 93d9b55..f9974df 100644
--- a/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_supervisory.xml
+++ b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_supervisory.xml
@@ -40,7 +40,7 @@
<SurfaceView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:id="@+id/surfaceview1" />
+ android:id="@+id/fragment_supervisory_enter_camera" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="@dimen/view_size_50"
@@ -75,7 +75,7 @@
>
<!--<com.bsk.zhangbo.demoforbsk.widget.MyGLSurfaceView-->
<SurfaceView
- android:id="@+id/surfaceview2"
+ android:id="@+id/fragment_supervisory_exit_camera"
android:layout_width="match_parent"
android:layout_height="match_parent"/>
@@ -119,10 +119,10 @@
<RadioGroup
android:layout_width="64dp"
android:layout_height="match_parent"
- android:id="@+id/radio_group">
+ android:id="@+id/fragment_supervisory_bottom_left_radio_group">
<RadioButton
- android:id="@+id/radio1"
+ android:id="@+id/fragment_supervisory_bottom_visitor_radio_button"
android:layout_width="match_parent"
android:layout_height="@dimen/view_size_0"
android:layout_weight="1"
@@ -135,7 +135,7 @@
android:text="璁垮"/>
<RadioButton
- android:id="@+id/radio2"
+ android:id="@+id/fragment_supervisory_bottom_attendance_radio_button"
android:layout_width="match_parent"
android:layout_height="@dimen/view_size_0"
android:layout_weight="1"
@@ -152,14 +152,14 @@
android:orientation="vertical">
<View
- android:id="@+id/radio_line1"
+ android:id="@+id/fragment_supervisory_bottom_visitor_background"
android:layout_width="match_parent"
android:layout_height="@dimen/view_size_0"
android:layout_weight="1"
android:background="@color/colorPrimary"></View>
<View
- android:id="@+id/radio_line2"
+ android:id="@+id/fragment_supervisory_bottom_attendance_background"
android:layout_width="match_parent"
android:layout_height="@dimen/view_size_0"
android:layout_weight="1"
--
Gitblit v1.8.0