From cf2204a85fa951dd9ce2698378101d822e6edbc8 Mon Sep 17 00:00:00 2001 From: guoshen <3129367635@qq.com> Date: 星期六, 06 七月 2024 10:31:02 +0800 Subject: [PATCH] 会议审批显示成功 --- app/src/main/java/com/application/zhangshi_app_android/ui/function/GrowthExperienceActivity.java | 67 +++++++++++++++++++++++++++++---- 1 files changed, 59 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/com/application/zhangshi_app_android/ui/function/GrowthExperienceActivity.java b/app/src/main/java/com/application/zhangshi_app_android/ui/function/GrowthExperienceActivity.java index c18bd94..86c2569 100644 --- a/app/src/main/java/com/application/zhangshi_app_android/ui/function/GrowthExperienceActivity.java +++ b/app/src/main/java/com/application/zhangshi_app_android/ui/function/GrowthExperienceActivity.java @@ -9,11 +9,14 @@ import android.view.animation.Transformation; import android.widget.FrameLayout; import android.widget.LinearLayout; +import android.widget.PopupWindow; import androidx.constraintlayout.widget.ConstraintLayout; import androidx.lifecycle.Observer; +import com.android.app_base.manager.AppManager; +import com.android.app_base.utils.ScreenSizeUtils; import com.android.app_base.utils.ToastUtils; import com.android.app_base.widget.LinearItemDecoration; import com.application.zhangshi_app_android.BR; @@ -30,6 +33,8 @@ import com.application.zhangshi_app_android.databinding.ActivityGrowthExperienceBinding; import com.application.zhangshi_app_android.ui.DLBaseActivity; import com.google.android.material.tabs.TabLayout; +import com.hjq.bar.TitleBar; + import java.util.List; /** @@ -42,6 +47,9 @@ private GrowthExperienceRelationshipRvAdapter relationshipRvAdapter; private GrowthExperienceHolderConditionRvAdapter holderConditionRvAdapter; private GrowthExperienceAbroadConditionRvAdapter abroadConditionRvAdapter; + + private PopupWindow mOperatePopupWindow; + @Override public int getLayoutId() { @@ -81,6 +89,38 @@ binding.rvAbroad.setNestedScrollingEnabled(false); binding.rvAbroad.setAdapter(abroadConditionRvAdapter); + mOperatePopupWindow = initPopUpWindow(View.inflate(this,R.layout.pop_personal_notepad,null)); + mOperatePopupWindow.getContentView().findViewById(R.id.layout_personal_notepad).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + mOperatePopupWindow.dismiss(); + AppManager.getAppManager().startActivity(PersonalNotepadActivity.class); + } + }); + binding.ivOperate.setOnClickListener(v -> { + mOperatePopupWindow.showAsDropDown(binding.ivOperate,-ScreenSizeUtils.dip2px(this,85) +binding.ivOperate.getWidth(),0); + }); + + final int SCROLL_THRESHOLD = 400; // 婊戝姩闃堝�硷紝鎸夐挳鍦ㄦ粦鍔ㄨ秴杩囪闃堝�煎悗寮�濮嬫牴鎹秴鍑洪槇鍊艰窛绂绘笎娓愭樉绀哄嚭鏉� + final int SCROLL_DISTANCE = 400; // 鎸夐挳浠庨殣钘忓埌鍏ㄩ儴鏄剧ず鍑烘潵闇�瑕佹粦鍔ㄧ殑璺濈 + binding.fabMoveToTop.setAlpha(0f); + binding.nestedScrollView.setOnScrollChangeListener(new View.OnScrollChangeListener() { + @Override + public void onScrollChange(View v, int scrollX, int scrollY, int oldScrollX, int oldScrollY) { + // 褰撴粦鍔ㄨ窛绂昏秴杩囬槇鍊间竴鍗婃椂锛屽紑濮嬫參鎱㈡樉绀烘寜閽� + if (scrollY >= SCROLL_THRESHOLD) { + // 鏍规嵁婊戝姩璺濈璁剧疆鎸夐挳閫忔槑搴� + float alpha = Math.min(1.0f, (float) (scrollY - SCROLL_THRESHOLD) / SCROLL_DISTANCE); + binding.fabMoveToTop.setAlpha(alpha); + } else { + binding.fabMoveToTop.setAlpha(0f); + } + } + }); + binding.fabMoveToTop.setOnClickListener(v -> { + // 鐐瑰嚮鎸夐挳杩斿洖椤堕儴 + binding.nestedScrollView.smoothScrollTo(0, 0); + }); } @Override @@ -98,12 +138,12 @@ public void initLiveDataObserve() { viewModel.getIsExperienceExpendedLiveData().observe(this, aBoolean -> { if (aBoolean){ - binding.ivExperienceFold.setOnClickListener(view -> { + binding.layoutExperienceTitle.setOnClickListener(view -> { collapseView(binding.layoutExperience,binding.layoutExperienceTitle); viewModel.getIsExperienceExpendedLiveData().setValue(false); }); }else { - binding.ivExperienceFold.setOnClickListener(view -> { + binding.layoutExperienceTitle.setOnClickListener(view -> { expendView(binding.layoutExperience); viewModel.getIsExperienceExpendedLiveData().setValue(true); }); @@ -111,12 +151,12 @@ }); viewModel.getIsRelationExpendedLiveData().observe(this, aBoolean -> { if (aBoolean){ - binding.ivRelationFold.setOnClickListener(view -> { + binding.layoutRelationTitle.setOnClickListener(view -> { collapseView(binding.layoutRelation,binding.layoutRelationTitle); viewModel.getIsRelationExpendedLiveData().setValue(false); }); }else { - binding.ivRelationFold.setOnClickListener(view -> { + binding.layoutRelationTitle.setOnClickListener(view -> { expendView(binding.layoutRelation); viewModel.getIsRelationExpendedLiveData().setValue(true); }); @@ -124,12 +164,12 @@ }); viewModel.getIsHolderExpendedLiveData().observe(this, aBoolean -> { if (aBoolean){ - binding.ivHolderFold.setOnClickListener(view -> { + binding.layoutHolderTitle.setOnClickListener(view -> { collapseView(binding.layoutHolder,binding.layoutHolderTitle); viewModel.getIsHolderExpendedLiveData().setValue(false); }); }else { - binding.ivHolderFold.setOnClickListener(view -> { + binding.layoutHolderTitle.setOnClickListener(view -> { expendView(binding.layoutHolder); viewModel.getIsHolderExpendedLiveData().setValue(true); }); @@ -137,12 +177,12 @@ }); viewModel.getIsAbroadExpendedLiveData().observe(this, aBoolean -> { if (aBoolean){ - binding.ivAbroadFold.setOnClickListener(view -> { + binding.layoutAbroadTitle.setOnClickListener(view -> { collapseView(binding.layoutAbroad,binding.layoutAbroadTitle); viewModel.getIsAbroadExpendedLiveData().setValue(false); }); }else { - binding.ivAbroadFold.setOnClickListener(view -> { + binding.layoutAbroadTitle.setOnClickListener(view -> { expendView(binding.layoutAbroad); viewModel.getIsAbroadExpendedLiveData().setValue(true); }); @@ -175,6 +215,12 @@ viewModel.getAutobiographyLiveData().observe(this, new Observer<List<GrowthExperienceAutobiographyBean>>() { @Override public void onChanged(List<GrowthExperienceAutobiographyBean> beans) { + if (beans==null||beans.size() == 0 ){ + binding.tvFill.setVisibility(View.GONE); + return; + }else { + binding.tvFill.setVisibility(View.VISIBLE); + } binding.tabLayout.removeAllTabs(); for (int i = 0; i < beans.size(); i++) { GrowthExperienceAutobiographyBean bean = beans.get(i); @@ -257,4 +303,9 @@ animator.start(); } + @Override + public void onLeftClick(TitleBar titleBar) { + finish(); + } + } -- Gitblit v1.9.1