Merge remote-tracking branch 'origin/master-new-炒锅' into master-new-炒锅

app/src/main/java/com/bonait/bnframework/ui/adapter/classify/GoodClassifyAdapter.java

@@ -28,10 +28,7 @@ public abstract class GoodClassifyAdapter extends BaseAdapter<BPA_GOODS_CLASSIFY
     @SuppressLint("SetTextI18n")
     @Override
     public void onBindViewHolder(@NonNull ViewHolder holder, @SuppressLint("RecyclerView") int position) {
-        if(DisplayManager.shouldScale(holder.binding.name)){
-            DisplayManager.scaleViewGroup(holder.binding.getRoot());
-        }
-        if(holder.binding.name.getTextSize()>34||holder.binding.name.getTextSize()<30){
+        if(holder.binding.name.getTextSize()> 34 || holder.binding.name.getTextSize()< 30){
             DisplayManager.scaleViewGroup(holder.binding.getRoot());
         }
         holder.binding.name.setText(mData.get(position).name+"");

app/src/main/java/com/bonait/bnframework/ui/adapter/goods/LocalGoodsAdapter.java

@@ -47,7 +47,7 @@ public abstract class LocalGoodsAdapter extends BaseAdapter<BPA_GOODS,LocalGoods
     public void onBindViewHolder(@NonNull GoodsViewHolder holder, @SuppressLint("RecyclerView") int position) {
         try {
 
-            if(holder.binding.name.getTextSize()> 34 || holder.binding.name.getTextSize()< 30){
+            if(holder.binding.name.getTextSize()> 30 || holder.binding.name.getTextSize()< 26){
                 DisplayManager.scaleViewGroup(holder.binding.getRoot());
             }
             holder.binding.add.setVisibility(View.GONE);

app/src/main/java/com/bonait/bnframework/ui/adapter/step/DiyStepAdapter.java

@@ -30,9 +30,10 @@ public abstract class DiyStepAdapter extends BaseAdapter<BPA_GOODS_PROCESS_DETAI
     @Override
     public void onBindViewHolder(@NonNull ViewHolder holder, @SuppressLint("RecyclerView") int position) {
         try {
-            if(DisplayManager.shouldScale(holder.binding.name)){
+            if(holder.binding.name.getTextSize()> 34 || holder.binding.name.getTextSize()< 30){
                 DisplayManager.scaleViewGroup(holder.binding.getRoot());
             }
+
             holder.binding.root.setSelected(mCurrentPosition == position);
             holder.binding.removeUp.setVisibility(mCurrentPosition == position?View.VISIBLE:View.GONE);
             holder.binding.removeDown.setVisibility(mCurrentPosition == position?View.VISIBLE:View.GONE);

app/src/main/java/com/bonait/bnframework/ui/adapter/step/StepAdapter.java

@@ -31,9 +31,10 @@ public class StepAdapter extends BaseAdapter<BPA_GOODS_PROCESS_DETAIL, StepAdapt
     @Override
     public void onBindViewHolder(@NonNull ViewHolder holder, @SuppressLint("RecyclerView") int position) {
         try {
-            if(DisplayManager.shouldScale(holder.binding.name)){
+            if(holder.binding.name.getTextSize()> 34 || holder.binding.name.getTextSize()< 30){
                 DisplayManager.scaleViewGroup(holder.binding.getRoot());
             }
+
             holder.binding.root.setSelected(mCurrentPosition == position);
             String name = mData.get(position).processms;//mData.get(position).processname +"  "+
             holder.binding.name.setText((position+1)+"."+name);

app/src/main/res/layout/item/layout/item_local_goods.xml

@@ -31,7 +31,7 @@
             tools:text="三月瓜"
             android:textAlignment="center"
             android:textColor="@color/black"
-            android:textSize="30dp"
+            android:textSize="28sp"
             android:textStyle="bold"
             android:ellipsize="middle"
             android:lines="1"