Commit b9b3595364abb23a8d10cf77580a4131f01e1bb0

Authored by 韩亚云
2 parents dd9b5110 3f5d3adb

Merge branch 'master' of bj.gitlab.cnlive.com:cnlive-team/newModuleStrike

 Conflicts:
	core/dentity_verfication/src/main/java/com/cnlive/core/company_verfication/ui/fragment/SelectCompanyDataFragment.java
core/dentity_verfication/src/main/java/com/cnlive/core/company_verfication/ui/fragment/SelectCompanyDataFragment.java
... ... @@ -7,6 +7,8 @@ import android.widget.TextView;
7 7 import com.cnlive.core.company_verfication.ui.adapter.CompanyItemDataAdapter;
8 8 import com.cnlive.core.company_verfication.ui.model.CompanyItemData;
9 9 import com.cnlive.core.libs.base.frame.fragment.BaseFragment;
  10 +import com.cnlive.core.libs.base.util.StatusBarConfig;
  11 +import com.cnlive.core.libs.base.util.StatusBarUtil;
10 12 import com.cnlive.core.people_verfication.R;
11 13 import com.cnlive.core.people_verfication.databinding.FragmentSelectInCompanyDataBinding;
12 14 import com.google.android.material.bottomsheet.BottomSheetBehavior;
... ... @@ -47,9 +49,10 @@ import androidx.recyclerview.widget.LinearLayoutManager;
47 49  
48 50 @Override
49 51 protected void initView() {
50   -// data.add("测试");
51   -// adapter = new CompanyDataAdapter(me, data);
  52 + //设置沉浸式状态栏
52 53 showImmersiveStatusBar();
  54 + //设置状态栏提示文字颜色
  55 + setStatusBarTextColor(StatusBarConfig.BLACK);
53 56 initTopBar();
54 57 List<CompanyItemData> list = new ArrayList<>();
55 58 list.add(new CompanyItemData(CompanyItemData.TYPE_ORGANIZATION, 0));
... ... @@ -95,13 +98,21 @@ import androidx.recyclerview.widget.LinearLayoutManager;
95 98  
96 99 }
97 100 });
98   -
  101 + //蒙版点击
  102 + binding.viewMask.setOnClickListener(new View.OnClickListener() {
  103 + @Override
  104 + public void onClick(View v) {
  105 + if (!isNull(behavior)) {
  106 + binding.viewMask.setVisibility(View.GONE);
  107 + behavior.setState(BottomSheetBehavior.STATE_HIDDEN);
  108 + }
  109 + }
  110 + });
99 111  
100 112 itemDataAdapter.setOnClickListener(new CompanyItemDataAdapter.OnClickListener() {
101 113 @Override
102 114 public void onClick(TextView textView) {
103 115 if (!isNull(behavior)) {
104   -
105 116 binding.viewMask.setVisibility(View.VISIBLE);
106 117 behavior.setState(BottomSheetBehavior.STATE_EXPANDED);
107 118 }
... ...