VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/SupervisoryAdapter.java
File was renamed from VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/HomeAdapter.java @@ -26,18 +26,18 @@ * Created by zhangbo on 2017/2/15. */ public class HomeAdapter extends EasyRecyclerViewAdapter { public class SupervisoryAdapter extends EasyRecyclerViewAdapter { private int TYPE_1 = 0,TYPE_2 = 1; private int type; private Context context; private List list; public HomeAdapter(Context context) { public SupervisoryAdapter(Context context) { this.context = context; } @Override public int[] getItemLayouts() { return new int[]{R.layout.fragment_home_bottom_register_cell,R.layout.fragment_home_bottom_visitor_cell}; return new int[]{R.layout.fragment_supervisory_bottom_register_cell,R.layout.fragment_supervisory_bottom_visitor_cell}; } @Override VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/base/MainActivity.java
@@ -7,11 +7,11 @@ import com.bsk.zhangbo.demoforbsk.R; import cn.com.basic.face.adapter.MyFragmentPagerAdapter; import cn.com.basic.face.fragment.SupervisoryFragment; import cn.com.basic.face.util.TabNameUtil; import cn.com.basic.face.fragment.AttendanceFragment; import cn.com.basic.face.fragment.CheckInFragment; import cn.com.basic.face.fragment.DeviceFragment; import cn.com.basic.face.fragment.HomeFragment; import cn.com.basic.face.fragment.PhoneCallFragment; import cn.com.basic.face.fragment.RegisterFragment; import cn.com.basic.face.fragment.VisitFragment; @@ -48,7 +48,7 @@ List<String> tabNamesList = Arrays.asList(TabNameUtil.tabNames); int[] tabIcons = TabNameUtil.tabIcons; MyFragmentPagerAdapter myFragmentPagerAdapter = new MyFragmentPagerAdapter(getSupportFragmentManager(),MainActivity.this); myFragmentPagerAdapter.addFragment(HomeFragment.getInstance(), tabNamesList.get(0),tabIcons[0]); myFragmentPagerAdapter.addFragment(SupervisoryFragment.getInstance(), tabNamesList.get(0),tabIcons[0]); myFragmentPagerAdapter.addFragment(RegisterFragment.getInstance(), tabNamesList.get(1),tabIcons[1]); myFragmentPagerAdapter.addFragment(CheckInFragment.getInstance(), tabNamesList.get(2),tabIcons[2]); myFragmentPagerAdapter.addFragment(PhoneCallFragment.newInstance(), tabNamesList.get(3),tabIcons[3]); VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/base/MainUIBaseFragment.java
@@ -15,8 +15,8 @@ @Override protected void initViews(View view, Bundle savedInstanceState) { this.view = view; FrameLayout right = (FrameLayout) this.view.findViewById(R.id.main_ui_base_right); FrameLayout left = (FrameLayout) this.view.findViewById(R.id.main_ui_base_left); 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()); } @@ -27,7 +27,7 @@ @Override protected int getLayoutId() { return R.layout.fragment_main_ui_base; return R.layout.fragment_left_right_frame_layout; } @Override VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/SupervisoryFragment.java
File was renamed from VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/HomeFragment.java @@ -15,7 +15,7 @@ import android.widget.RadioGroup; import com.bsk.zhangbo.demoforbsk.R; import cn.com.basic.face.adapter.HomeAdapter; import cn.com.basic.face.adapter.SupervisoryAdapter; import cn.com.basic.face.base.BaseFragment; import cn.com.basic.face.service.CheckInMng; import cn.com.basic.face.util.RtspFaceNative; @@ -27,19 +27,17 @@ import java.util.ArrayList; import java.util.List; import cn.com.basic.face.discern.query.item.CheckInQueryItem; /** * Created by zhangbo on 2017/2/15. */ public class HomeFragment extends BaseFragment { public class SupervisoryFragment extends BaseFragment { private RadioGroup mRadioGroup; private RadioButton mRadioButton1, mRadioButton2; private View mRadioLine1, mRadioLine2; private HomeAdapter mAdapter; private SupervisoryAdapter mAdapter; private List mList; private EasyRecyclerView mRecyclerViewRegister, mRecyclerViewUser; @@ -67,15 +65,15 @@ } private static HomeFragment instance = new HomeFragment(); private static SupervisoryFragment instance = new SupervisoryFragment(); public static HomeFragment getInstance() { public static SupervisoryFragment getInstance() { return instance; } @Override protected int getLayoutId() { return R.layout.fragment_home; return R.layout.fragment_supervisory; } @Override @@ -92,7 +90,7 @@ GridLayoutManager gridLayoutManager = new GridLayoutManager(getActivity(), 2); gridLayoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); mRecyclerViewRegister.setLayoutManager(gridLayoutManager); mAdapter = new HomeAdapter(getActivity()); mAdapter = new SupervisoryAdapter(getActivity()); mSurfaceView2 = (SurfaceView) view.findViewById(R.id.surfaceview2); VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/CheckInMng.java
@@ -3,7 +3,6 @@ import android.widget.Toast; import cn.com.basic.face.base.BaseApplication; import cn.com.basic.face.fragment.HomeFragment; import cn.com.basic.face.fragment.CheckInFragment; import cn.com.basic.face.util.AppApi; @@ -54,7 +53,7 @@ params.addBodyParameter(VisitorQueryCondition.FieldNames.notCompanyId, BaseApplication.getInstance().getPlace().getCompanyId()); x.http().post(params, new BaseCommonCallBack() { public void success() { //HomeFragment.getInstance().visitorListChanged(getList(CheckInQueryItem.class)); //SupervisoryFragment.getInstance().visitorListChanged(getList(CheckInQueryItem.class)); } }); } VisitFace/DemoForBsk/app/src/main/res/layout/fragment_left_right_frame_layout.xml
File was renamed from VisitFace/DemoForBsk/app/src/main/res/layout/fragment_main_ui_base.xml @@ -12,7 +12,7 @@ android:layout_height="match_parent" android:orientation="horizontal"> <FrameLayout android:id="@+id/main_ui_base_left" android:id="@+id/fragment_left_right_frame_layout_left" android:layout_width="318dp" android:layout_height="match_parent"></FrameLayout> <View @@ -20,7 +20,7 @@ android:layout_height="match_parent" android:background="@color/colorText_b"/> <FrameLayout android:id="@+id/main_ui_base_right" android:id="@+id/fragment_left_right_frame_layout_right" android:layout_width="match_parent" android:layout_height="match_parent"></FrameLayout> </LinearLayout> VisitFace/DemoForBsk/app/src/main/res/layout/fragment_supervisory.xml
VisitFace/DemoForBsk/app/src/main/res/layout/fragment_supervisory_bottom_register_cell.xml
VisitFace/DemoForBsk/app/src/main/res/layout/fragment_supervisory_bottom_visitor_cell.xml