修改接料右上角+号闪退问题

app/src/main/java/com/uas/hystorage/fragment/ChargingSummaryFragment.java

@@ -5,6 +5,7 @@ import android.os.Bundle;
 import android.view.KeyEvent;
 import android.view.View;
 import android.widget.Button;
+import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.PopupWindow;
 
@@ -46,7 +47,7 @@ public class ChargingSummaryFragment extends BaseFragment {
     private Column<String> mTypeColumn, mdetailColumn;
     private Column<Double> mProdcodeColumn,mOutqtyColumn;
     private String ma_code;
-    private Button mMoreBtn;
+    private ImageView mListImageView;
 
     @Override
     protected int getLayout() {
@@ -56,8 +57,8 @@ public class ChargingSummaryFragment extends BaseFragment {
     @Override
     protected void initViews() {
         setTitle("上料汇总");
-        ((FunctionActivity) getActivity()).setMoreBtnVisible(true);
-        mMoreBtn = (Button)mActivity.findViewById(R.id.btn_actionbar_more);
+        ((FunctionActivity) getActivity()).setListIconIvVisible(true);
+        mListImageView = (ImageView) mActivity.findViewById(R.id.btn_actionbar_list_icon_iv);
         Bundle arguments = getArguments();
         if (arguments != null) {
             mSccode = arguments.getString(Constants.FLAG.SC_CODE, "");
@@ -100,7 +101,7 @@ public class ChargingSummaryFragment extends BaseFragment {
                 getChargingSummart();
             }
         });
-        mMoreBtn.setOnClickListener(new View.OnClickListener() {
+        mListImageView.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 showMoreMenu();
@@ -118,7 +119,7 @@ public class ChargingSummaryFragment extends BaseFragment {
      * 展示扩展菜单
      */
     private void showMoreMenu() {
-        View view = View.inflate(getActivity(), R.layout.pop_postpunch_add_menu, null);
+        View view = View.inflate(mActivity, R.layout.pop_postpunch_add_menu, null);
         Button addBtn = (Button) view.findViewById(R.id.pop_storage_in_add_menu_1);
         addBtn.setText("在制转移");
 
@@ -130,8 +131,8 @@ public class ChargingSummaryFragment extends BaseFragment {
                 closeMenuPopupWindow();
             }
         });
-        CommonUtil.setBackgroundAlpha(Objects.requireNonNull(getActivity()), 0.5f);
-        mMenuPopupWindow.showAsDropDown(mMoreBtn);
+        CommonUtil.setBackgroundAlpha(Objects.requireNonNull(mActivity), 0.5f);
+        mMenuPopupWindow.showAsDropDown(mListImageView);
 
         addBtn.setOnClickListener(new View.OnClickListener() {
             @Override
@@ -214,9 +215,9 @@ public class ChargingSummaryFragment extends BaseFragment {
         if (!hidden) {
             setTitle(title);
             getChargingSummart();
-            ((FunctionActivity) getActivity()).setMoreBtnVisible(true);
+            ((FunctionActivity) getActivity()).setListIconIvVisible(true);
         } else {
-            ((FunctionActivity) getActivity()).setMoreBtnVisible(false);
+            ((FunctionActivity) getActivity()).setListIconIvVisible(false);
         }
     }
 

app/src/main/java/com/uas/hystorage/fragment/GdMaterialInFragment.java

@@ -629,9 +629,11 @@ public class GdMaterialInFragment extends BaseFragment implements View.OnClickLi
         super.onHiddenChanged(hidden);
         if (hidden) {
             ((FunctionActivity) getActivity()).setMoreBtnVisible(false);
+            ((FunctionActivity) getActivity()).setListIconIvVisible(false);
         } else {
             ((FunctionActivity) getActivity()).setTitle("上料");
             ((FunctionActivity) getActivity()).setMoreBtnVisible(true);
+            ((FunctionActivity) getActivity()).setListIconIvVisible(false);
         }
     }
 

build.gradle

@@ -47,8 +47,8 @@ ext {
             targetSdkVersion : 28,
             compileSdkVersion: 28,
             buildToolsVersion: "28.0.3",
-            versionCode      : 28,
-            versionName      : "v1.1.8"
+            versionCode      : 29,
+            versionName      : "v1.1.9"
     ]
 
     depsVersion = [