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

韩亚云
2 parents 4d1c5b77 8ac7ea6c
Showing 10 changed files with 267 additions and 29 deletions
core/base/src/main/java/com/cnlive/core/libs/base/frame/activity/BaseActivity.java
core/base/src/main/java/com/cnlive/core/libs/base/frame/fragment/BaseFragment.java
core/base/src/main/res/values/colors.xml
core/dentity_verfication/src/main/java/com/cnlive/core/company_verfication/ui/adapter/CompanyItemDataAdapter.java
core/dentity_verfication/src/main/java/com/cnlive/core/company_verfication/ui/fragment/BottomSheetDialog.java
core/dentity_verfication/src/main/java/com/cnlive/core/company_verfication/ui/fragment/SelectCompanyDataFragment.java
core/dentity_verfication/src/main/res/drawable/shape_verficat_bottom_sheet_white_bg.xml
core/dentity_verfication/src/main/res/layout/fragment_bottom.xml
core/dentity_verfication/src/main/res/layout/fragment_select_in_company_data.xml
core/dentity_verfication/src/main/res/layout/item_company_data_type_organization.xml
@@ -19,8 +19,10 @@ import android.os.Message;
 import android.provider.Settings;
 import android.text.TextUtils;
 import android.util.DisplayMetrics;
+import android.util.Log;
 import android.view.MotionEvent;
 import android.view.View;
+import android.view.ViewGroup;
 import android.view.Window;
 import android.view.WindowManager;
 import android.view.inputmethod.InputMethodManager;
@@ -240,6 +242,39 @@ public abstract class BaseActivity&lt;V extends BaseView, P extends BasePresenter&lt;V
     }
     /**
+     * 获取状态栏高度dp
+     *
+     * @return
+     */
+    public int getStatusBarHeight() {
+        return StatusBarUtil.getStatusBarHeight(this);
+    }
+
+    /**将标题视图自适应沉浸式状态栏
+     * @param view
+     */
+    public void setTitleViewAdjustImmersiveStatusBar(View view)  {
+        if (null==view){
+            Log.e(TAG,"setTitleViewAdjustImmersiveStatusBar->view is Null");
+        }
+        ViewGroup.LayoutParams params = view.getLayoutParams();
+        if (null==params){
+            Log.e(TAG,"setTitleViewAdjustImmersiveStatusBar->LayoutParams is Null 无法将标题视图自适应沉浸式状态栏!");
+            return;
+        }
+        int oldHeight = params.height;
+        if (oldHeight<=0){
+            Log.e(TAG,"setTitleViewAdjustImmersiveStatusBar->无法获取标题视图高度!");
+            return;
+        }
+        if (0==getStatusBarHeight()){
+            Log.e(TAG,"setTitleViewAdjustImmersiveStatusBar->无法获取状态栏高度!");
+            return;
+        }
+        params.height = oldHeight + getStatusBarHeight();
+        view.setLayoutParams(params);
+    }
+    /**
      * 设置状态栏字体颜色
      */
     // 定义适用于参数的注解，限定取值范围为{STATUS_OPEN, STATUS_CLOSE}
@@ -29,6 +29,7 @@ import com.cnlive.core.libs.base.util.ReflectUtil;
 import com.cnlive.core.libs.base.frame.view.BaseView;
 import com.cnlive.core.libs.base.util.StatusBarConfig;
 import com.cnlive.cloud.base.R;
+import com.cnlive.core.libs.base.util.StatusBarUtil;
 import com.hannesdorfmann.mosby3.mvp.MvpBasePresenter;
 import com.me.yokeyword.fragmentation.ExtraTransaction;
 import com.me.yokeyword.fragmentation.ISupportFragment;
@@ -411,9 +412,28 @@ public abstract class BaseFragment&lt;V extends BaseView, P extends BasePresenter&lt;V
     /**
      * 沉浸式状态栏
      */
-    public void showImmersiveStatusBar(){
+    public void showImmersiveStatusBar() {
         me.showImmersiveStatusBar();
     }
+
+    /**
+     * 将标题视图自适应沉浸式状态栏
+     *
+     * @param view
+     */
+    public void setTitleViewAdjustImmersiveStatusBar(View view) {
+        me.setTitleViewAdjustImmersiveStatusBar(view);
+    }
+
+    /**
+     * 获取状态栏高度
+     *
+     * @return
+     */
+    public int getStatusBarHeight() {
+        return me.getStatusBarHeight();
+    }
+
     @Override
     public void onDestroy() {
         super.onDestroy();
@@ -67,4 +67,5 @@
     <color name="color_9c9c9c">#9c9c9c</color>
     <color name="color_ff3b30">#ff3b30</color>
+    <color name="black_50_percentage">#80000000</color>
 </resources>
 \ No newline at end of file
@@ -4,6 +4,7 @@ import android.content.Context;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.TextView;
 import com.cnlive.core.company_verfication.ui.model.CompanyItemData;
 import com.cnlive.core.people_verfication.R;
@@ -26,12 +27,17 @@ import androidx.recyclerview.widget.RecyclerView;
  */public class CompanyItemDataAdapter extends RecyclerView.Adapter {
     private Context context;
     private List<CompanyItemData> dataList;
+    private OnClickListener onClickListener;
     public CompanyItemDataAdapter(Context context, List<CompanyItemData> dataList) {
         this.context = context;
         this.dataList = dataList;
     }
+    public void setOnClickListener(OnClickListener onClickListener) {
+        this.onClickListener = onClickListener;
+    }
+
     @NonNull
     @Override
     public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
@@ -112,17 +118,25 @@ import androidx.recyclerview.widget.RecyclerView;
             super(binding.getRoot());
             this.binding = binding;
             binding.ivOrganizationDelete.setOnClickListener(this);
+            binding.tvOrganization.setOnClickListener(this);
         }
         @Override
         public void onClick(View v) {
+            //删除机构
             if (v.getId() == R.id.iv_organization_delete) {
                 //获取当前所在逻辑位置
                 int logicPosition = dataList.get(getLayoutPosition()).getLogicPosition();
                 deleteLogicItem(logicPosition);
-                dataList.add(new CompanyItemData(CompanyItemData.TYPE_ADD_ORGANIZATION, dataList.get(dataList.size()-1).getLogicPosition()));
+                dataList.add(new CompanyItemData(CompanyItemData.TYPE_ADD_ORGANIZATION, dataList.get(dataList.size() - 1).getLogicPosition()));
                 notifyDataSetChanged();
             }
+            //选中机构
+            else if (v.getId() == R.id.tv_organization) {
+                if (null != onClickListener) {
+                    onClickListener.onClick(binding.tvOrganization);
+                }
+            }
         }
     }
@@ -258,4 +272,8 @@ import androidx.recyclerview.widget.RecyclerView;
             }
         }
     }
+
+    public interface OnClickListener {
+        void onClick(TextView textView);
+    }
 }
+package com.cnlive.core.company_verfication.ui.fragment;
+
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.cnlive.core.people_verfication.R;
+import com.google.android.material.bottomsheet.BottomSheetDialogFragment;
+
+public class BottomSheetDialog extends BottomSheetDialogFragment {
+    @Nullable
+    @Override
+    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+
+        return inflater.inflate(R.layout.fragment_bottom, container, false);
+    }
+
+    @Override
+    public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+
+
+    }
+}
 \ No newline at end of file
 package com.cnlive.core.company_verfication.ui.fragment;
+import android.view.Gravity;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.LinearLayout;
+import android.widget.RelativeLayout;
+import android.widget.TextView;
+
 import com.cnlive.core.company_verfication.ui.adapter.CompanyDataAdapter;
 import com.cnlive.core.company_verfication.ui.adapter.CompanyItemDataAdapter;
 import com.cnlive.core.company_verfication.ui.model.CompanyItemData;
 import com.cnlive.core.libs.base.frame.fragment.BaseFragment;
+import com.cnlive.core.libs.base.util.StatusBarUtil;
 import com.cnlive.core.people_verfication.R;
 import com.cnlive.core.people_verfication.databinding.FragmentSelectInCompanyDataBinding;
+import com.google.android.material.bottomsheet.BottomSheetBehavior;
 import java.util.ArrayList;
 import java.util.List;
+import androidx.annotation.NonNull;
+import androidx.coordinatorlayout.widget.CoordinatorLayout;
 import androidx.databinding.ViewDataBinding;
 import androidx.recyclerview.widget.LinearLayoutManager;
@@ -19,32 +30,96 @@ import androidx.recyclerview.widget.LinearLayoutManager;
  */public class SelectCompanyDataFragment extends BaseFragment {
     private List<String> data = new ArrayList<>();
     private FragmentSelectInCompanyDataBinding binding;
-    private CompanyDataAdapter adapter;
     private CompanyItemDataAdapter itemDataAdapter;
+    private BottomSheetBehavior behavior;
     @Override
     protected int getBindLayoutId() {
         return R.layout.fragment_select_in_company_data;
     }
-        @Override
+    @Override
     protected void initBindingLayoutData(ViewDataBinding baseBinding) {
         super.initBindingLayoutData(baseBinding);
-        binding= (FragmentSelectInCompanyDataBinding) baseBinding;
+        binding = (FragmentSelectInCompanyDataBinding) baseBinding;
     }
+
     @Override
     protected void initView() {
 //        data.add("测试");
 //        adapter = new CompanyDataAdapter(me, data);
-        List<CompanyItemData>list=new ArrayList<>();
-        list.add(new CompanyItemData(CompanyItemData.TYPE_ORGANIZATION,0));
-        list.add(new CompanyItemData(CompanyItemData.TYPE_CIRCLE,0));
-        list.add(new CompanyItemData(CompanyItemData.TYPE_ADD_CIRCLE,0));
-        list.add(new CompanyItemData(CompanyItemData.TYPE_CHILD_ACCOUNT,0));
-        list.add(new CompanyItemData(CompanyItemData.TYPE_ADD_CHILD_ACCOUNT,0));
-        list.add(new CompanyItemData(CompanyItemData.TYPE_ADD_ORGANIZATION,0));
-        itemDataAdapter=new CompanyItemDataAdapter(me,list);
+        showImmersiveStatusBar();
+        initTopBar();
+        List<CompanyItemData> list = new ArrayList<>();
+        list.add(new CompanyItemData(CompanyItemData.TYPE_ORGANIZATION, 0));
+        list.add(new CompanyItemData(CompanyItemData.TYPE_CIRCLE, 0));
+        list.add(new CompanyItemData(CompanyItemData.TYPE_ADD_CIRCLE, 0));
+        list.add(new CompanyItemData(CompanyItemData.TYPE_CHILD_ACCOUNT, 0));
+        list.add(new CompanyItemData(CompanyItemData.TYPE_ADD_CHILD_ACCOUNT, 0));
+        list.add(new CompanyItemData(CompanyItemData.TYPE_ADD_ORGANIZATION, 0));
+        itemDataAdapter = new CompanyItemDataAdapter(me, list);
         binding.recyclerView.setLayoutManager(new LinearLayoutManager(me));
         binding.recyclerView.setAdapter(itemDataAdapter);
+        binding.viewMask.setVisibility(View.GONE);
+        behavior = BottomSheetBehavior.from(binding.llBottom);
+        behavior.setBottomSheetCallback(new BottomSheetBehavior.BottomSheetCallback() {
+            @Override
+            public void onStateChanged(@NonNull View bottomSheet, @BottomSheetBehavior.State int newState) {
+                String state = "null";
+                switch (newState) {
+                    case 1:
+                        state = "STATE_DRAGGING";//过渡状态此时用户正在向上或者向下拖动bottom sheet
+                        break;
+                    case 2:
+                        state = "STATE_SETTLING"; // 视图从脱离手指自由滑动到最终停下的这一小段时间
+                        break;
+                    case 3:
+                        state = "STATE_EXPANDED"; //处于完全展开的状态
+
+                        break;
+                    case 4:
+                        state = "STATE_COLLAPSED"; //默认的折叠状态
+                        binding.viewMask.setVisibility(View.GONE);
+                        break;
+                    case 5:
+                        state = "STATE_HIDDEN"; //下滑动完全隐藏 bottom sheet
+                        binding.viewMask.setVisibility(View.GONE);
+                        break;
+                }
+
+            }
+
+            @Override
+            public void onSlide(@NonNull View view, float v) {
+
+            }
+        });
+
+
+        itemDataAdapter.setOnClickListener(new CompanyItemDataAdapter.OnClickListener() {
+            @Override
+            public void onClick(TextView textView) {
+                if (!isNull(behavior)) {
+
+                    binding.viewMask.setVisibility(View.VISIBLE);
+                    behavior.setState(BottomSheetBehavior.STATE_EXPANDED);
+                }
+//                BottomSheetDialog bottomSheetDialog=new BottomSheetDialog();
+//                bottomSheetDialog.show(getFragmentManager(),TAG);
+            }
+        });
+    }
+
+    private void initTopBar() {
+        // 设置标题栏的内容在状态栏之下
+        binding.topbar.setTitle("填写公司信息");
+        // 设置标题栏 + 状态栏的高度
+        setTitleViewAdjustImmersiveStatusBar(binding.llTop);
+        binding.topbar.addLeftImageButton(R.drawable.icon_verficat_back, R.id.back_btn).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                me.finish();
+            }
+        });
     }
 }
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <corners
+        android:topLeftRadius="10dp"
+        android:topRightRadius="10dp" />
+    <solid android:color="@color/white" />
+</shape>
 \ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:id="@+id/recyclerview"
+        android:layout_width="match_parent"
+        android:layout_height="500dp"
+        android:background="@drawable/shape_verficat_bottom_sheet_white_bg"
+        android:clickable="true"
+        android:focusable="true"></LinearLayout>
+</LinearLayout>
 \ No newline at end of file
 <?xml version="1.0" encoding="utf-8"?>
 <layout>
-    <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    <androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:app="http://schemas.android.com/apk/res-auto"
         xmlns:tools="http://schemas.android.com/tools"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         tools:context="com.cnlive.core.company_verfication.ui.activity.SelectCompanyDataActivity">
-        <TextView
+        <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="43dp"
-            android:background="@color/color_48A7F9"
-            android:gravity="center"
-            android:text="请选择在网家家平台上与您相关的所有机构公司信息"
-            android:textColor="@color/white"
-            android:drawableRight="@drawable/icon_verficat_tip"
-            app:layout_constraintStart_toStartOf="parent"
-            android:paddingRight="10dp"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/recyclerView"
+            android:layout_height="match_parent"
+            android:orientation="vertical">
+            <!--标题-->
+            <LinearLayout
+                android:id="@+id/ll_top"
+                android:layout_width="match_parent"
+                android:layout_height="?attr/qmui_topbar_height"
+                android:background="@color/white"
+                android:gravity="bottom">
+
+                <com.qmuiteam.qmui.widget.QMUITopBar
+                    android:id="@+id/topbar"
+                    android:layout_width="match_parent"
+                    android:layout_height="?attr/qmui_topbar_height" />
+            </LinearLayout>
+
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="43dp"
+                android:background="@color/color_48A7F9"
+                android:drawableRight="@drawable/icon_verficat_tip"
+                android:gravity="center"
+                android:paddingRight="10dp"
+                android:text="请选择在网家家平台上与您相关的所有机构公司信息"
+                android:textColor="@color/white"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/recyclerView"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent" />
+        </LinearLayout>
+
+        <View
+            android:id="@+id/view_mask"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:layout_marginTop="43dp" />
-    </androidx.constraintlayout.widget.ConstraintLayout>
+            android:background="#80000000"
+            android:clickable="true"
+            android:focusable="true" />
+
+        <LinearLayout
+            android:id="@+id/ll_bottom"
+            android:layout_width="match_parent"
+            android:layout_height="500dp"
+            android:background="@drawable/shape_verficat_bottom_sheet_white_bg"
+            android:clickable="true"
+            android:focusable="true"
+            android:orientation="vertical"
+            app:behavior_hideable="true"
+            app:behavior_peekHeight="0dp"
+            app:layout_behavior="@string/bottom_sheet_behavior"></LinearLayout>
+    </androidx.coordinatorlayout.widget.CoordinatorLayout>
 </layout>
@@ -71,6 +71,7 @@
             <TextView
+                android:id="@+id/tv_organization"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:background="@drawable/shape_verficat_et_5_round_black_bg"