Commit b9b3595364abb23a8d10cf77580a4131f01e1bb0
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
Showing
1 changed file
with
15 additions
and
4 deletions
core/dentity_verfication/src/main/java/com/cnlive/core/company_verfication/ui/fragment/SelectCompanyDataFragment.java
| @@ -7,6 +7,8 @@ import android.widget.TextView; | @@ -7,6 +7,8 @@ import android.widget.TextView; | ||
| 7 | import com.cnlive.core.company_verfication.ui.adapter.CompanyItemDataAdapter; | 7 | import com.cnlive.core.company_verfication.ui.adapter.CompanyItemDataAdapter; |
| 8 | import com.cnlive.core.company_verfication.ui.model.CompanyItemData; | 8 | import com.cnlive.core.company_verfication.ui.model.CompanyItemData; |
| 9 | import com.cnlive.core.libs.base.frame.fragment.BaseFragment; | 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 | import com.cnlive.core.people_verfication.R; | 12 | import com.cnlive.core.people_verfication.R; |
| 11 | import com.cnlive.core.people_verfication.databinding.FragmentSelectInCompanyDataBinding; | 13 | import com.cnlive.core.people_verfication.databinding.FragmentSelectInCompanyDataBinding; |
| 12 | import com.google.android.material.bottomsheet.BottomSheetBehavior; | 14 | import com.google.android.material.bottomsheet.BottomSheetBehavior; |
| @@ -47,9 +49,10 @@ import androidx.recyclerview.widget.LinearLayoutManager; | @@ -47,9 +49,10 @@ import androidx.recyclerview.widget.LinearLayoutManager; | ||
| 47 | 49 | ||
| 48 | @Override | 50 | @Override |
| 49 | protected void initView() { | 51 | protected void initView() { |
| 50 | -// data.add("测试"); | ||
| 51 | -// adapter = new CompanyDataAdapter(me, data); | 52 | + //设置沉浸式状态栏 |
| 52 | showImmersiveStatusBar(); | 53 | showImmersiveStatusBar(); |
| 54 | + //设置状态栏提示文字颜色 | ||
| 55 | + setStatusBarTextColor(StatusBarConfig.BLACK); | ||
| 53 | initTopBar(); | 56 | initTopBar(); |
| 54 | List<CompanyItemData> list = new ArrayList<>(); | 57 | List<CompanyItemData> list = new ArrayList<>(); |
| 55 | list.add(new CompanyItemData(CompanyItemData.TYPE_ORGANIZATION, 0)); | 58 | list.add(new CompanyItemData(CompanyItemData.TYPE_ORGANIZATION, 0)); |
| @@ -95,13 +98,21 @@ import androidx.recyclerview.widget.LinearLayoutManager; | @@ -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 | itemDataAdapter.setOnClickListener(new CompanyItemDataAdapter.OnClickListener() { | 112 | itemDataAdapter.setOnClickListener(new CompanyItemDataAdapter.OnClickListener() { |
| 101 | @Override | 113 | @Override |
| 102 | public void onClick(TextView textView) { | 114 | public void onClick(TextView textView) { |
| 103 | if (!isNull(behavior)) { | 115 | if (!isNull(behavior)) { |
| 104 | - | ||
| 105 | binding.viewMask.setVisibility(View.VISIBLE); | 116 | binding.viewMask.setVisibility(View.VISIBLE); |
| 106 | behavior.setState(BottomSheetBehavior.STATE_EXPANDED); | 117 | behavior.setState(BottomSheetBehavior.STATE_EXPANDED); |
| 107 | } | 118 | } |