1.修改正式服务器地址

2.修复自适应插件，大小改变bug；

app/src/main/java/com/phlx/anchorcollect/net/RetrofitClient.java

@@ -50,16 +50,16 @@ public class RetrofitClient {
     private static final int CACHE_TIMEOUT = 10 * 1024 * 1024;
     //服务端根路径
     public static String baseUrl =
-//        "serve.xlglmnmyzspt.org.cn"//正式old
+        "serve.xlglmnmyzspt.org.cn"//正式old
 //        "serve.xlglzy.org.cn"//正式
 //        "39.101.170.186"//阿里云测试
-            "192.168.8.135"//董
+//            "192.168.8.135"//董
 //            "192.168.43.154"//张敏
             ;
     public static String port =
-//            ""//正式
+            ""//正式
 //            "9000"//阿里云测试
-            "9000"//董
+//            "9000"//董
             ;
 
     private static Context mContext = Utils.getContext();

app/src/main/java/com/phlx/anchorcollect/ui/fragment/BasicsCollectFragment.java

@@ -85,7 +85,8 @@ public class BasicsCollectFragment extends BaseFragment<FragmentBasicsCollectBin
     }
 
     @Override
-    public int initContentView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+    public int initContentView(LayoutInflater inflater, @Nullable ViewGroup container,
+                               @Nullable Bundle savedInstanceState) {
         return R.layout.fragment_basics_collect;
     }
 
@@ -130,10 +131,11 @@ public class BasicsCollectFragment extends BaseFragment<FragmentBasicsCollectBin
         if (!hidden) {
             viewModel.addInventoryListener();
             initImagePicker();
-            viewModel.initDataForUnid(Configs.tempUnid);
             Configs.currentEvent = EventTag.EVENT_WEIGHT_DATA_BASICS;
+            if (!Configs.currentEvent.equals(EventTag.EVENT_WEIGHT_DATA_BASICS))//防止拍照刷新页面
+                viewModel.initDataForUnid(Configs.tempUnid);
         } else {
-            Configs.currentEvent = EventTag.EVENT_WEIGHT_DATA_BASICS;
+//            Configs.currentEvent = EventTag.EVENT_WEIGHT_DATA_BASICS;
             viewModel.removeInventoryListener();
             Configs.currentEvent = "";
             App.getInstance().getLinkage().stopInventory();
@@ -414,7 +416,8 @@ public class BasicsCollectFragment extends BaseFragment<FragmentBasicsCollectBin
         if (uiParamEntity.getJavaType().equals("Long") || uiParamEntity.getJavaType().equals("Integer")) {
             inputType = InputType.TYPE_CLASS_NUMBER;
         } else if (uiParamEntity.getJavaType().equals("BigDecimal") || uiParamEntity.getJavaType().equals("Duoble")) {
-            inputType = InputType.TYPE_CLASS_NUMBER | InputType.TYPE_NUMBER_FLAG_DECIMAL | InputType.TYPE_NUMBER_FLAG_SIGNED;
+            inputType =
+                    InputType.TYPE_CLASS_NUMBER | InputType.TYPE_NUMBER_FLAG_DECIMAL | InputType.TYPE_NUMBER_FLAG_SIGNED;
             ;
         } else if (uiParamEntity.getJavaType().equals("String")) {
             inputType = InputType.TYPE_CLASS_TEXT;
@@ -458,7 +461,8 @@ public class BasicsCollectFragment extends BaseFragment<FragmentBasicsCollectBin
          //                                .widgetColor(Color.BLUE)//输入框光标的颜色
          .inputType(inputType)//可以输入的类型
          //前2个一个是hint一个是预输入的文字
-         .input("输入" + uiParamEntity.getColumnComment(), uiParamEntity.getShowName(), new MaterialDialog.InputCallback() {
+         .input("输入" + uiParamEntity.getColumnComment(), uiParamEntity.getShowName(), new MaterialDialog
+         .InputCallback() {
 
         @Override public void onInput(@NonNull MaterialDialog dialog, CharSequence input) {
 
@@ -487,6 +491,9 @@ public class BasicsCollectFragment extends BaseFragment<FragmentBasicsCollectBin
 
     //拍照
     private void showPhotoDialog(GenTableColumn uiParamEntity) {
+//
+//        Configs.tempTag = viewModel.tag.get();
+//        Configs.tempRfid = viewModel.rfid.get();
 
         RxPermissions rxPermissions = new RxPermissions(getActivity());
         rxPermissions.request(Manifest.permission.CAMERA, Manifest.permission
@@ -564,7 +571,8 @@ public class BasicsCollectFragment extends BaseFragment<FragmentBasicsCollectBin
                 @Override
                 public void onSuccess(String path) {
                     Bitmap bitmap = BaseImageUtils.decodeBitmap(path, getActivity());
-//                    Bitmap bitmap2 = BaseImageUtils.rotateBitmapByDegree(bitmap, BaseImageUtils.getBitmapDegree(path));
+//                    Bitmap bitmap2 = BaseImageUtils.rotateBitmapByDegree(bitmap, BaseImageUtils.getBitmapDegree
+//                    (path));
                     BaseImageUtils.saveBitmapToSDCard(bitmap, viewModel.getMarkImgUrl());
                     Configs.tempCattleResume.setPhotoPath(viewModel.getMarkImgUrl());
                     Glide.with(getActivity())

app/src/main/java/com/phlx/anchorcollect/ui/main/MainActivity.java

 package com.phlx.anchorcollect.ui.main;
 
+import android.content.res.Resources;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 import android.os.SystemClock;
@@ -31,6 +32,7 @@ import com.uhf.structures.DynamicQParams;
 import com.uhf.structures.InventoryParams;
 
 import me.goldze.mvvmhabit.utils.ToastUtils;
+import me.jessyan.autosize.AutoSizeCompat;
 
 public class MainActivity extends BaseActivity<ActivityMainBinding, MainVM> {
 
@@ -349,4 +351,11 @@ public class MainActivity extends BaseActivity<ActivityMainBinding, MainVM> {
         super.onDestroy();
         finishRFID();
     }
+    @Override
+    public Resources getResources() {
+        //需要升级到 v1.1.2 及以上版本才能使用 AutoSizeCompat
+        AutoSizeCompat.autoConvertDensityOfGlobal(super.getResources());//如果没有自定义需求用这个方法
+        // AutoSizeCompat.autoConvertDensity(super.getResources(), 667, false);//如果有自定义需求就用这个方法
+        return super.getResources();
+    }
 }

app/src/main/res/layout/fragment_basics_collect.xml

@@ -525,13 +525,13 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="5dp"
-                    binding:adapter="@{adapter}"
                     binding:itemBinding="@{viewModel.itemBinding}"
                     binding:items="@{viewModel.observableList}"
                     binding:layoutManager="@{LayoutManagers.grid(3)}"
                     binding:layout_constraintLeft_toLeftOf="parent"
                     binding:layout_constraintRight_toRightOf="parent"
                     binding:layout_constraintTop_toBottomOf="@+id/card_100" />
+<!--                    binding:adapter="@{adapter}"-->
             </androidx.constraintlayout.widget.ConstraintLayout>
         </androidx.core.widget.NestedScrollView>