Topbar Update

src/main/java/com/common/activity/TakePhotoActivity.java

@@ -70,7 +70,7 @@ public class TakePhotoActivity extends BaseActivity {
         TopBar topBar = findViewById(R.id.activity_take_photo_topbar);
         topBar.setStatusBarHeight(QMUIStatusBarHelper.getStatusbarHeight(this));
         topBar.toolBar().addLeftBackImageButton().setOnClickListener(v -> finish());
-        QMUIHelper.madeTopBar(topBar);
+        QMUIHelper.getTopbarCustomizer().madeTopBar(topBar);
 
         btnCapture = findViewById(R.id.button_shoot);
         mbtnCancel = findViewById(R.id.button_cancel);

src/main/java/com/common/base/BaseActivity.java

@@ -266,12 +266,14 @@ public abstract class BaseActivity extends AppCompatActivity implements IView {
      * 默认TopBar只包含一个BackButton 和 Titile
      */
     protected void initTopBar(TopBar topBar) {
-        topBar.toolBar().addLeftBackImageButton().setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                finish();
-            }
-        });
+//        topBar.toolBar().addLeftBackImageButton().setOnClickListener(new View.OnClickListener() {
+//            @Override
+//            public void onClick(View v) {
+//                finish();
+//            }
+//        });
+        //bug fix：每个客户单独定制初始化动作
+        QMUIHelper.getTopbarCustomizer2().initTopBar(topBar,this);
     }
 
     public void setTopBarTitle(String title) {

src/main/java/com/common/base/BaseFragment.java

@@ -129,12 +129,14 @@ public abstract class BaseFragment extends Fragment implements IView {
      * 默认TopBar只包含一个BackButton 和 Titile
      */
     protected void initTopBar(TopBar topBar) {
-        mTopBar.toolBar().addLeftBackImageButton().setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                UIHelper.doBack();
-            }
-        });
+//        mTopBar.toolBar().addLeftBackImageButton().setOnClickListener(new View.OnClickListener() {
+//            @Override
+//            public void onClick(View v) {
+//                UIHelper.doBack();
+//            }
+//        });
+        //bug fix：每个客户单独定制初始化动作
+        QMUIHelper.getTopbarCustomizer2().initTopBar(topBar,getActivity());
     }
 
 

src/main/java/tech/starwin/utils/ui_utils/QMUIHelper.java

 package tech.starwin.utils.ui_utils;
 
+import android.app.Activity;
 import android.content.Context;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
@@ -24,6 +25,7 @@ import com.qmuiteam.qmui.widget.grouplist.QMUIGroupListView;
 import tech.starwin.R;
 import tech.starwin.utils.BitmapUtils;
 import tech.starwin.utils.format_utils.StringFormat;
+
 import com.common.widget.PageStateLayout;
 import com.common.widget.TopBar;
 
@@ -32,7 +34,7 @@ import com.common.widget.TopBar;
  * QMUI辅助类
  */
 public class QMUIHelper {
-    private static TopbarCustomizer topbarCustomizer;
+    private static TopbarCustomizer2 topbarCustomizer2;
 
     /**
      * 重新设置topbarimagebutton的图片尺寸
@@ -161,27 +163,71 @@ public class QMUIHelper {
         if (isTransParentStatusBar) {
             topBar.setStatusBarHeight(QMUIStatusBarHelper.getStatusbarHeight(viewGroup.getContext()));
         }
-        if (topbarCustomizer != null) {
-            topbarCustomizer.madeTopBar(topBar);
+        if (topbarCustomizer2 != null) {
+            topbarCustomizer2.madeTopBar(topBar);
         }
         return topBar;
     }
 
 
+    public static void setTopbarCustomizer(TopbarCustomizer2 customizer) {
+        topbarCustomizer2 = customizer;
+    }
+
     public static void setTopbarCustomizer(TopbarCustomizer customizer) {
-        topbarCustomizer = customizer;
+        topbarCustomizer2 = new TopbarCustomizer2(customizer) {
+            @Override
+            public void madeTopBar(TopBar topBar) {
+                getCustomizer().madeTopBar(topBar);
+            }
+
+            @Override
+            public void initTopBar(TopBar topBar, Activity activity) {
+
+            }
+        };
+    }
+
+    public static TopbarCustomizer getTopbarCustomizer() {
+        return topbarCustomizer2.getCustomizer();
     }
 
-    public static void madeTopBar(TopBar topBar){
-        topbarCustomizer.madeTopBar(topBar);
+    public static TopbarCustomizer2 getTopbarCustomizer2() {
+        return topbarCustomizer2;
     }
 
+
     /**
      * TopBar默认样式定制
      */
     public interface TopbarCustomizer {
-        //        void madeTopBar(ViewGroup titleGroup, QMUITopBar topBar);
+        //全局样式
         void madeTopBar(TopBar topBar);
     }
 
+
+    /**
+     * 更新：可定制初始化内容
+     */
+    public abstract static class TopbarCustomizer2 {
+        private TopbarCustomizer customizer;
+
+        public TopbarCustomizer2(TopbarCustomizer customizer) {
+            this.customizer = customizer;
+        }
+
+        public TopbarCustomizer2() {
+        }
+
+        public TopbarCustomizer getCustomizer() {
+            return customizer;
+        }
+
+        public abstract void madeTopBar(TopBar topBar);
+
+        public abstract void initTopBar(TopBar topBar, Activity activity);
+
+    }
+
+
 }