From 771a848eea904046c68ffad084b5d68eadc9ebee Mon Sep 17 00:00:00 2001 From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674> Date: 星期三, 05 四月 2017 09:58:52 +0800 Subject: [PATCH] --- VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/VisitRightFormRowLeft.java | 56 ++++++++ VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/SurvalanceMng.java | 14 - VisitFace/DemoForBsk/app/src/main/res/layout/fragment_visit_right_form_row_left.xml | 23 +++ VisitFace/DemoForBsk/app/src/main/res/layout/fragment_visit_right_form_row_right.xml | 21 +++ VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/base/MainActivity.java | 4 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/SurveillanceFragment.java | 12 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/SupervisoryBottomListView.java | 6 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/VisitRightFormRowRight.java | 56 ++++++++ VisitFace/DemoForBsk/app/src/main/res/layout/fragment_surveillance_bottom_visitor_cell.xml | 0 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/VisitFragment.java | 52 ++++-- VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/PhoneCallMng.java | 8 + VisitFace/DemoForBsk/app/src/main/res/layout/fragment_surveillance.xml | 0 VisitFace/DemoForBsk/app/src/main/res/layout/fragment_visit_right_form_row.xml | 0 VisitFace/DemoForBsk/app/src/main/res/layout/fragment_surveillance_bottom_visit_blank_cell.xml | 0 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/SurveillanceBottomListViewAdapter.java | 6 VisitFace/DemoForBsk/app/src/main/res/layout/fragment_surveillance_bottom_register_cell.xml | 0 VisitFace/DemoForBsk/app/src/main/res/layout/fragment_visit_right_form_row1.xml | 22 +++ VisitFace/DemoForBsk/app/src/main/res/layout/fragment_visit_right.xml | 30 +++- VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/VisitRightFormRow.java | 84 ++++++++++++ VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/CheckInMng.java | 1 20 files changed, 346 insertions(+), 49 deletions(-) diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/SupervisoryBottomListViewAdapter.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/SurveillanceBottomListViewAdapter.java similarity index 95% rename from VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/SupervisoryBottomListViewAdapter.java rename to VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/SurveillanceBottomListViewAdapter.java index 11717ec..f4221d8 100644 --- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/SupervisoryBottomListViewAdapter.java +++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/SurveillanceBottomListViewAdapter.java @@ -19,15 +19,15 @@ import cn.com.basic.face.discern.query.item.FacePhotoItem; -public class SupervisoryBottomListViewAdapter extends EasyRecyclerViewAdapter { +public class SurveillanceBottomListViewAdapter extends EasyRecyclerViewAdapter { private Context context; - public SupervisoryBottomListViewAdapter(Context context) { + public SurveillanceBottomListViewAdapter(Context context) { this.context = context; } @Override public int[] getItemLayouts() { - return new int[]{R.layout.fragment_supervisory_bottom_register_cell,R.layout.fragment_supervisory_bottom_visitor_cell, R.layout.fragment_supervisory_bottom_visit_blank_cell}; + return new int[]{R.layout.fragment_surveillance_bottom_register_cell,R.layout.fragment_surveillance_bottom_visitor_cell, R.layout.fragment_surveillance_bottom_visit_blank_cell}; } @Override diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/base/MainActivity.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/base/MainActivity.java index 4ac2691..22c7596 100644 --- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/base/MainActivity.java +++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/base/MainActivity.java @@ -6,7 +6,7 @@ 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.fragment.SurveillanceFragment; import cn.com.basic.face.util.TabNameUtil; import cn.com.basic.face.fragment.AttendanceFragment; import cn.com.basic.face.fragment.CheckInFragment; @@ -47,7 +47,7 @@ List<String> tabNamesList = Arrays.asList(TabNameUtil.tabNames); int[] tabIcons = TabNameUtil.tabIcons; MyFragmentPagerAdapter myFragmentPagerAdapter = new MyFragmentPagerAdapter(getSupportFragmentManager(),MainActivity.this); - myFragmentPagerAdapter.addFragment(SupervisoryFragment.getInstance(), tabNamesList.get(0),tabIcons[0]); + myFragmentPagerAdapter.addFragment(SurveillanceFragment.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.getInstance(), tabNamesList.get(3),tabIcons[3]); 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/SurveillanceFragment.java similarity index 92% rename from VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/SupervisoryFragment.java rename to VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/SurveillanceFragment.java index 9e4042b..efc404a 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/SurveillanceFragment.java @@ -12,7 +12,7 @@ import com.bsk.zhangbo.demoforbsk.util.RtspFaceNative; -import cn.com.basic.face.service.SupervisoryMng; +import cn.com.basic.face.service.SurvalanceMng; import cn.com.basic.face.widget.SupervisoryBottomListView; import com.lidroid.xutils.view.annotation.ViewInject; @@ -22,7 +22,7 @@ * Created by zhangbo on 2017/2/15. */ -public class SupervisoryFragment extends BaseFragment { +public class SurveillanceFragment extends BaseFragment { @ViewInject(R.id.fragment_supervisory_bottom_left_radio_group) private RadioGroup fragment_supervisory_bottom_left_radio_group; @@ -50,9 +50,9 @@ } } - private static SupervisoryFragment instance = new SupervisoryFragment(); + private static SurveillanceFragment instance = new SurveillanceFragment(); - public static SupervisoryFragment getInstance() { + public static SurveillanceFragment getInstance() { return instance; } @@ -66,7 +66,7 @@ @Override protected int getLayoutId() { - return R.layout.fragment_supervisory; + return R.layout.fragment_surveillance; } @Override @@ -120,7 +120,7 @@ } private void reloadBottomList() { - SupervisoryMng.getInstance().findSupervisoryBottomList(fragment_supervisory_bottom_visitor_radio_button.isChecked()); + SurvalanceMng.getInstance().findSupervisoryBottomList(fragment_supervisory_bottom_visitor_radio_button.isChecked()); } } 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 649076e..bb7047e 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 @@ -15,35 +15,53 @@ import com.camnter.easyrecyclerview.holder.EasyRecyclerViewHolder; import com.camnter.easyrecyclerview.widget.EasyRecyclerView; import com.lidroid.xutils.ViewUtils; +import com.lidroid.xutils.view.annotation.ViewInject; import com.lidroid.xutils.view.annotation.event.OnClick; import java.util.ArrayList; import java.util.List; -/** - * Created by Sinoe on 2017/2/23. - */ - 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, - mRow5TextViewLeft,mRow5TextViewRight,mRow6TextViewLeft,mRow6TextViewRight,mRow7TextViewLeft,mRow7TextViewRight; + private View fragment_visit_left; + private View mViewRight; + private LinearLayout mRowLayout1; + private LinearLayout mRowLayout2; + private LinearLayout mRowLayout3; + private LinearLayout mRowLayout4; + private LinearLayout mRowLayout5; + private LinearLayout mRowLayout6; + private LinearLayout mRowLayout7; + private TextView mRow1TextViewLeft; + private TextView mRow1TextViewRight; + private TextView mRow2TextViewLeft; + private TextView mRow2TextViewRight; + private TextView mRow3TextViewLeft; + private TextView mRow3TextViewRight; + private TextView mRow4TextViewLeft; + private TextView mRow4TextViewRight; + private TextView mRow5TextViewLeft; + private TextView mRow5TextViewRight; + private TextView mRow6TextViewLeft; + private TextView mRow6TextViewRight; + private TextView mRow7TextViewLeft; + private TextView mRow7TextViewRight; private VisitLeftAdapter mAdapter; - private EasyRecyclerView mRecyclerView; + @ViewInject(R.id.fragment_attendance_left_list_view) + private EasyRecyclerView fragment_attendance_left_list_view; private int mOldPosition = 0,mNewPosition = 0; public static VisitFragment newInstance(){ return new VisitFragment(); } public View addLeftLayout() { - mViewLeft = LayoutInflater.from(getActivity()).inflate(R.layout.fragment_visit_left,null); - mRecyclerView = (EasyRecyclerView) mViewLeft.findViewById(R.id.fragment_attendance_left_list_view); + fragment_visit_left = LayoutInflater.from(getActivity()).inflate(R.layout.fragment_visit_left,null); + ViewUtils.inject(this, fragment_visit_left); + LinearLayoutManager manager = new LinearLayoutManager(getActivity(),LinearLayoutManager.VERTICAL,false); - mRecyclerView.setLayoutManager(manager); + fragment_attendance_left_list_view.setLayoutManager(manager); mAdapter = new VisitLeftAdapter(); - ViewUtils.inject(this, mViewLeft); - return mViewLeft; + + return fragment_visit_left; } public View addRightLayout() { @@ -105,7 +123,7 @@ list.add(""); } mAdapter.setList(list); - mRecyclerView.setAdapter(mAdapter); + fragment_attendance_left_list_view.setAdapter(mAdapter); } @Override @@ -118,10 +136,6 @@ mOldPosition = mNewPosition; mAdapter.getItem(position); Toast.makeText(getActivity(),position+"",Toast.LENGTH_SHORT).show(); -// Log.e("aaaaaaaaaaaaaaaaaa",position+""); -//// ((CheckBox)mRecyclerView.getChildAt(position).findViewById(R.id.item_visitor_info_check)).setChecked(true); -// CheckBox checkBox = (CheckBox) mRecyclerView.getChildAt(position).findViewById(R.id.item_visitor_info_check); -// checkBox.setChecked(true); } } diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/CheckInMng.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/CheckInMng.java index ffd6f76..e9c6245 100644 --- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/CheckInMng.java +++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/CheckInMng.java @@ -4,7 +4,6 @@ import cn.com.basic.face.base.BaseApplication; import cn.com.basic.face.fragment.CheckInFragment; -import cn.com.basic.face.fragment.SupervisoryFragment; import cn.com.basic.face.util.AppApi; import org.xutils.http.RequestParams; diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/PhoneCallMng.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/PhoneCallMng.java new file mode 100644 index 0000000..96aa280 --- /dev/null +++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/PhoneCallMng.java @@ -0,0 +1,8 @@ +package cn.com.basic.face.service; + +/** + * Created by xiuxi on 2017/4/5. + */ + +public class PhoneCallMng { +} diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/SupervisoryMng.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/SurvalanceMng.java similarity index 86% rename from VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/SupervisoryMng.java rename to VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/SurvalanceMng.java index 32fce45..cbe8749 100644 --- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/SupervisoryMng.java +++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/SurvalanceMng.java @@ -4,13 +4,11 @@ import org.xutils.x; import java.util.ArrayList; -import java.util.Collections; -import java.util.Comparator; import java.util.List; import cn.com.basic.face.discern.common.BaseCommonCallBack; import cn.com.basic.face.discern.query.item.SupervisoryQueryItem; -import cn.com.basic.face.fragment.SupervisoryFragment; +import cn.com.basic.face.fragment.SurveillanceFragment; import cn.com.basic.face.util.AppApi; import cn.com.basic.face.util.Constant; @@ -18,11 +16,11 @@ * Created by xiuxi on 2017/3/31. */ -public class SupervisoryMng { +public class SurvalanceMng { - private static SupervisoryMng instance = new SupervisoryMng(); + private static SurvalanceMng instance = new SurvalanceMng(); - public static SupervisoryMng getInstance() { + public static SurvalanceMng getInstance() { return instance; } @@ -47,9 +45,9 @@ List<SupervisoryQueryItem> doubleList = new ArrayList<SupervisoryQueryItem>(); fillBlank(list, doubleList); - SupervisoryFragment.getInstance().get_fragment_supervisory_bottom_visit_list_view().show(doubleList, true); + SurveillanceFragment.getInstance().get_fragment_supervisory_bottom_visit_list_view().show(doubleList, true); } else { - SupervisoryFragment.getInstance().get_fragment_supervisory_bottom_attendance_list_view().show(list, true); + SurveillanceFragment.getInstance().get_fragment_supervisory_bottom_attendance_list_view().show(list, 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 34732ec..faeb5fa 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,7 +13,7 @@ import java.util.ArrayList; import java.util.List; -import cn.com.basic.face.adapter.SupervisoryBottomListViewAdapter; +import cn.com.basic.face.adapter.SurveillanceBottomListViewAdapter; import cn.com.basic.face.base.MainActivity; import cn.com.basic.face.util.WindowsUtil; @@ -41,11 +41,11 @@ setLayoutManager(gridLayoutManager); } - private SupervisoryBottomListViewAdapter mAdapter; + private SurveillanceBottomListViewAdapter mAdapter; private List list = new ArrayList(); public void setAdapter(Context context) { - mAdapter = new SupervisoryBottomListViewAdapter(context); + mAdapter = new SurveillanceBottomListViewAdapter(context); mAdapter.setList(list); setAdapter(mAdapter); initLayout(); diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/VisitRightFormRow.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/VisitRightFormRow.java new file mode 100644 index 0000000..ec4fe60 --- /dev/null +++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/VisitRightFormRow.java @@ -0,0 +1,84 @@ +package cn.com.basic.face.widget; + +import android.content.Context; +import android.content.res.TypedArray; +import android.support.v7.widget.ActionMenuView; +import android.util.AttributeSet; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.LinearLayout; +import android.widget.TextView; + +import com.bsk.zhangbo.demoforbsk.R; +import com.lidroid.xutils.ViewUtils; +import com.lidroid.xutils.view.annotation.ViewInject; + +import cn.com.basic.face.base.MainActivity; +import cn.com.basic.face.util.WindowsUtil; + +public class VisitRightFormRow extends LinearLayout { + + public VisitRightFormRow(Context context) { + super(context); + init(); + } + + public VisitRightFormRow(Context context, AttributeSet attrs) { + super(context, attrs); + init(); + TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.RegisterRightFieldTextView, 0, 0); + + String label = a.getString(R.styleable.RegisterRightFieldTextView_label); + + //fragment_register_right_label_label.setText(label); + + String text = a.getString(R.styleable.RegisterRightFieldTextView_text); + //fragment_register_right_label_text.setText(text); + } + + public VisitRightFormRow(Context context, AttributeSet attrs, int defStyleAttr) { + super(context, attrs, defStyleAttr); + init(); + } + + public VisitRightFormRow(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) { + super(context, attrs, defStyleAttr, defStyleRes); + init(); + } + + private void init() { + LayoutInflater inflater = (LayoutInflater) MainActivity.getInstance().getSystemService(Context.LAYOUT_INFLATER_SERVICE); + +// LinearLayout fragment_visit_right_form_row1 = (LinearLayout) inflater.inflate(R.layout.fragment_visit_right_form_row1, null); +// View childView = fragment_visit_right_form_row1.getChildAt(0); +// fragment_visit_right_form_row1.removeView(childView); +// addView(childView); + + View view = inflate(getContext(), R.layout.fragment_visit_right_form_row1, this); + ViewUtils.inject(this, view); + + LinearLayout parent_view = (LinearLayout) findViewById(R.id.parent_view); + + View leftView = inflater.inflate(R.layout.fragment_visit_right_form_row_left, null); + //leftView.getLayoutParams().width = 19000; +// ActionMenuView.LayoutParams params = new ActionMenuView.LayoutParams(); + + parent_view.addView(leftView); + + View rightView = inflater.inflate(R.layout.fragment_visit_right_form_row_right, null); + parent_view.addView(rightView); + + System.out.print(""); + + + LinearLayout.LayoutParams lp = new LinearLayout.LayoutParams(new LayoutParams(WindowsUtil.dip2px(MainActivity.getInstance(),298), LayoutParams.WRAP_CONTENT)); + LinearLayout.LayoutParams lp2 = new LinearLayout.LayoutParams(new LayoutParams(WindowsUtil.dip2px(MainActivity.getInstance(),298), LayoutParams.WRAP_CONTENT)); + leftView.setLayoutParams(lp); + rightView.setLayoutParams(lp2); + + System.out.print(""); + + } + +} diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/VisitRightFormRowLeft.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/VisitRightFormRowLeft.java new file mode 100644 index 0000000..b32b6ad --- /dev/null +++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/VisitRightFormRowLeft.java @@ -0,0 +1,56 @@ +package cn.com.basic.face.widget; + +import android.content.Context; +import android.content.res.TypedArray; +import android.util.AttributeSet; +import android.view.LayoutInflater; +import android.view.View; +import android.widget.LinearLayout; + +import com.bsk.zhangbo.demoforbsk.R; +import com.lidroid.xutils.ViewUtils; + +import cn.com.basic.face.base.MainActivity; + +public class VisitRightFormRowLeft extends LinearLayout { + + public VisitRightFormRowLeft(Context context) { + super(context); + init(); + } + + public VisitRightFormRowLeft(Context context, AttributeSet attrs) { + super(context, attrs); + init(); + TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.RegisterRightFieldTextView, 0, 0); + + String label = a.getString(R.styleable.RegisterRightFieldTextView_label); + + //fragment_register_right_label_label.setText(label); + + String text = a.getString(R.styleable.RegisterRightFieldTextView_text); + //fragment_register_right_label_text.setText(text); + } + + public VisitRightFormRowLeft(Context context, AttributeSet attrs, int defStyleAttr) { + super(context, attrs, defStyleAttr); + init(); + } + + public VisitRightFormRowLeft(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) { + super(context, attrs, defStyleAttr, defStyleRes); + init(); + } + + private void init() { + View view = inflate(getContext(), R.layout.fragment_visit_right_form_row_left, this); + ViewUtils.inject(this, view); + +// LayoutInflater inflater = (LayoutInflater) MainActivity.getInstance().getSystemService(Context.LAYOUT_INFLATER_SERVICE); +// View v1 = inflater.inflate(R.layout.fragment_visit_right_form_row_left, null); +// LinearLayout parent_view = (LinearLayout) findViewById(R.id.parent_view); +// parent_view.addView(v1); + System.out.print(""); + } + +} diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/VisitRightFormRowRight.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/VisitRightFormRowRight.java new file mode 100644 index 0000000..14c6b7e --- /dev/null +++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/VisitRightFormRowRight.java @@ -0,0 +1,56 @@ +package cn.com.basic.face.widget; + +import android.content.Context; +import android.content.res.TypedArray; +import android.util.AttributeSet; +import android.view.LayoutInflater; +import android.view.View; +import android.widget.LinearLayout; + +import com.bsk.zhangbo.demoforbsk.R; +import com.lidroid.xutils.ViewUtils; + +import cn.com.basic.face.base.MainActivity; + +public class VisitRightFormRowRight extends LinearLayout { + + public VisitRightFormRowRight(Context context) { + super(context); + init(); + } + + public VisitRightFormRowRight(Context context, AttributeSet attrs) { + super(context, attrs); + init(); + TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.RegisterRightFieldTextView, 0, 0); + + String label = a.getString(R.styleable.RegisterRightFieldTextView_label); + + //fragment_register_right_label_label.setText(label); + + String text = a.getString(R.styleable.RegisterRightFieldTextView_text); + //fragment_register_right_label_text.setText(text); + } + + public VisitRightFormRowRight(Context context, AttributeSet attrs, int defStyleAttr) { + super(context, attrs, defStyleAttr); + init(); + } + + public VisitRightFormRowRight(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) { + super(context, attrs, defStyleAttr, defStyleRes); + init(); + } + + private void init() { + View view = inflate(getContext(), R.layout.fragment_visit_right_form_row_right, this); + ViewUtils.inject(this, view); + + LayoutInflater inflater = (LayoutInflater) MainActivity.getInstance().getSystemService(Context.LAYOUT_INFLATER_SERVICE); + View v1 = inflater.inflate(R.layout.fragment_visit_right_form_row_left, null); + LinearLayout parent_view = (LinearLayout) findViewById(R.id.parent_view); + parent_view.addView(v1); + System.out.print(""); + } + +} diff --git a/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_supervisory.xml b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_surveillance.xml similarity index 100% rename from VisitFace/DemoForBsk/app/src/main/res/layout/fragment_supervisory.xml rename to VisitFace/DemoForBsk/app/src/main/res/layout/fragment_surveillance.xml diff --git a/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_supervisory_bottom_register_cell.xml b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_surveillance_bottom_register_cell.xml similarity index 100% rename from VisitFace/DemoForBsk/app/src/main/res/layout/fragment_supervisory_bottom_register_cell.xml rename to VisitFace/DemoForBsk/app/src/main/res/layout/fragment_surveillance_bottom_register_cell.xml diff --git a/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_supervisory_bottom_visit_blank_cell.xml b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_surveillance_bottom_visit_blank_cell.xml similarity index 100% rename from VisitFace/DemoForBsk/app/src/main/res/layout/fragment_supervisory_bottom_visit_blank_cell.xml rename to VisitFace/DemoForBsk/app/src/main/res/layout/fragment_surveillance_bottom_visit_blank_cell.xml diff --git a/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_supervisory_bottom_visitor_cell.xml b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_surveillance_bottom_visitor_cell.xml similarity index 100% rename from VisitFace/DemoForBsk/app/src/main/res/layout/fragment_supervisory_bottom_visitor_cell.xml rename to VisitFace/DemoForBsk/app/src/main/res/layout/fragment_surveillance_bottom_visitor_cell.xml diff --git a/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_visit_right.xml b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_visit_right.xml index bc7c5ca..d0efc58 100644 --- a/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_visit_right.xml +++ b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_visit_right.xml @@ -50,13 +50,29 @@ android:textSize="@dimen/text_size_big" android:textStyle="bold" android:text="@string/base_information"/> - <include layout="@layout/fragment_visit_right_row" + + <cn.com.basic.face.widget.VisitRightFormRow + android:layout_width="match_parent" + android:layout_height="wrap_content"> + <!--<include layout="@layout/fragment_visit_right_form_row_left" + android:layout_height="wrap_content" + android:layout_width="wrap_content"/> + <include layout="@layout/fragment_visit_right_form_row_right"/>--> + </cn.com.basic.face.widget.VisitRightFormRow> +<!-- + <include layout="@layout/fragment_visit_right_form_row1"> + <include layout="@layout/fragment_visit_right_form_row_left" + android:layout_height="wrap_content" + android:layout_width="wrap_content"/> + <include layout="@layout/fragment_visit_right_form_row_right"/> + </include>--> + <include layout="@layout/fragment_visit_right_form_row" android:id="@+id/visitor_manager_row1"/> - <include layout="@layout/fragment_visit_right_row" + <include layout="@layout/fragment_visit_right_form_row" android:id="@+id/visitor_manager_row2"/> - <include layout="@layout/fragment_visit_right_row" + <include layout="@layout/fragment_visit_right_form_row" android:id="@+id/visitor_manager_row3"/> - <include layout="@layout/fragment_visit_right_row" + <include layout="@layout/fragment_visit_right_form_row" android:id="@+id/visitor_manager_row4"/> <TextView android:layout_width="wrap_content" @@ -66,11 +82,11 @@ android:textStyle="bold" android:layout_marginTop="28dp" android:text="@string/visitor_information"/> - <include layout="@layout/fragment_visit_right_row" + <include layout="@layout/fragment_visit_right_form_row" android:id="@+id/visitor_manager_row5"/> - <include layout="@layout/fragment_visit_right_row" + <include layout="@layout/fragment_visit_right_form_row" android:id="@+id/visitor_manager_row6"/> - <include layout="@layout/fragment_visit_right_row" + <include layout="@layout/fragment_visit_right_form_row" android:id="@+id/visitor_manager_row7"/> </LinearLayout> </ScrollView> diff --git a/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_visit_right_row.xml b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_visit_right_form_row.xml similarity index 100% rename from VisitFace/DemoForBsk/app/src/main/res/layout/fragment_visit_right_row.xml rename to VisitFace/DemoForBsk/app/src/main/res/layout/fragment_visit_right_form_row.xml diff --git a/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_visit_right_form_row1.xml b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_visit_right_form_row1.xml new file mode 100644 index 0000000..98860ec --- /dev/null +++ b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_visit_right_form_row1.xml @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="utf-8"?> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:orientation="vertical" + android:layout_width="match_parent" + android:layout_height="wrap_content" + > + <LinearLayout + android:id="@+id/parent_view" + android:paddingTop="13dp" + android:paddingBottom="13dp" + android:gravity="center_horizontal" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="horizontal"> + </LinearLayout> + <View + android:layout_width="match_parent" + android:layout_height="@dimen/view_size_1" + android:background="@color/colorText_b" + android:layout_marginLeft="5dp"/> + +</LinearLayout> \ No newline at end of file diff --git a/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_visit_right_form_row_left.xml b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_visit_right_form_row_left.xml new file mode 100644 index 0000000..9de9ee1 --- /dev/null +++ b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_visit_right_form_row_left.xml @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="utf-8"?> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="298dp" + android:layout_height="wrap_content" + android:orientation="horizontal" + android:id="@+id/fragment_visit_right_form_row_left_linear_layout" + > + <TextView + android:id="@+id/visitor_manager_row_title_left" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textSize="@dimen/text_size_big" + android:text="left:" + android:textColor="@color/colorText_5"/> + <TextView + android:id="@+id/visitor_manager_row_content_left" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:textSize="@dimen/text_size_big" + android:text="left" + android:textColor="@color/colorText_b" + android:background="@null"/> +</LinearLayout> diff --git a/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_visit_right_form_row_right.xml b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_visit_right_form_row_right.xml new file mode 100644 index 0000000..ce8f4dd --- /dev/null +++ b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_visit_right_form_row_right.xml @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="utf-8"?> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="298dp" + android:layout_height="wrap_content" + android:orientation="horizontal"> + <TextView + android:id="@+id/visitor_manager_row_title_right" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textSize="@dimen/text_size_big" + android:text="right:" + android:textColor="@color/colorText_5"/> + <TextView + android:id="@+id/visitor_manager_row_content_right" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:textSize="@dimen/text_size_big" + android:text="right" + android:textColor="@color/colorText_b" + android:background="@null"/> +</LinearLayout> -- Gitblit v1.8.0