feat: 优化

app/src/main/java/com/huntersun/vkyes/etcopencard/project/ui/activity/BusinessDetectionActivity.java

@@ -34,6 +34,7 @@ import com.huntersun.vkyes.etcopencard.src.action.StatusAction;
 import com.huntersun.vkyes.etcopencard.src.aop.SingleClick;
 import com.huntersun.vkyes.etcopencard.src.app.AppActivity;
 import com.huntersun.vkyes.etcopencard.src.widget.StatusLayout;
+import com.parkingwang.keyboard.PopupKeyboard;
 import com.scwang.smart.refresh.layout.api.RefreshLayout;
 import com.scwang.smart.refresh.layout.listener.OnRefreshLoadMoreListener;
 
@@ -47,6 +48,8 @@ import retrofit2.Response;
  */
 public class BusinessDetectionActivity extends AppActivity
         implements OnRefreshLoadMoreListener, StatusAction {
+    private PopupKeyboard popupKeyboard;
+
     private ActivityBusinessDetectionBinding binding;
     private int page = 1;
     private int orderStep = 0;
@@ -68,9 +71,10 @@ public class BusinessDetectionActivity extends AppActivity
         binding.rlStatusRefresh.setOnRefreshListener(this);
         SearchCarInfoUtils searchUtils = new SearchCarInfoUtils(this, new SearchCarInfoUtils.OnCustomReqCallback() {
             @Override
-            public void request(String vehicle, int vehicleColor) {
+            public void request(String vehicle, int vehicleColor, PopupKeyboard mPopupKeyboard) {
                 licensePlate = vehicle;
                 licensePlateColor = vehicleColor;
+                popupKeyboard = mPopupKeyboard;
             }
         });
         searchUtils.setExpandParams(true,true);
@@ -114,6 +118,10 @@ public class BusinessDetectionActivity extends AppActivity
                     @SuppressLint("NotifyDataSetChanged")
                     @Override
                     protected void onSuccess(ResultBean resultBean, ResultBean.BizContent bizContent1) {
+                        if (popupKeyboard != null){
+                            popupKeyboard.dismiss(BusinessDetectionActivity.this);
+                        }
+
                         int totalSize = Integer.parseInt(bizContent1.getTotalCount()); // 获取总的数据条数
                         if (page == 1) {
                             adapter.replaceData(bizContent1.getData());
@@ -133,6 +141,9 @@ public class BusinessDetectionActivity extends AppActivity
                     @Override
                     public void onError(String err, Response<Result> resp) {
                         super.onError(err, resp);
+                        if (popupKeyboard != null){
+                            popupKeyboard.dismiss(BusinessDetectionActivity.this);
+                        }
                         showError(new StatusLayout.OnRetryListener() {
                             @Override
                             public void onRetry(StatusLayout layout) {

app/src/main/java/com/huntersun/vkyes/etcopencard/project/ui/activity/after/CheckRunningWaterStep1Activity.java

@@ -16,6 +16,7 @@ import com.huntersun.vkyes.etcopencard.project.utils.SearchCarInfoUtils;
 import com.huntersun.vkyes.etcopencard.src.action.StatusAction;
 import com.huntersun.vkyes.etcopencard.src.app.AppActivity;
 import com.huntersun.vkyes.etcopencard.src.widget.StatusLayout;
+import com.parkingwang.keyboard.PopupKeyboard;
 import com.scwang.smart.refresh.layout.api.RefreshLayout;
 import com.scwang.smart.refresh.layout.listener.OnRefreshLoadMoreListener;
 
@@ -36,7 +37,7 @@ public class CheckRunningWaterStep1Activity extends AppActivity implements OnRef
 
     private CheckRunningCardListAdapter adapter;
     private String curVehicleId;
-    private EditText etSearch;
+    private PopupKeyboard popupKeyboard;
 
     @Override
     protected View getLayoutView() {
@@ -67,10 +68,10 @@ public class CheckRunningWaterStep1Activity extends AppActivity implements OnRef
 
         new SearchCarInfoUtils(this,new SearchCarInfoUtils.OnCustomReqCallback() {
             @Override
-            public void request(String vehicleId) {
+            public void request(String vehicleId, PopupKeyboard mPopupKeyboard) {
                 binding.rlStatusRefresh.setVisibility(View.VISIBLE);
                 curVehicleId = vehicleId;
-                //etSearch = et;
+                popupKeyboard = mPopupKeyboard;
                 getList();
             }
         });
@@ -82,7 +83,8 @@ public class CheckRunningWaterStep1Activity extends AppActivity implements OnRef
         MyRetrofit.newInstance(IFCode.IFCODE152, params, new MyRetrofit.ReturnResult() {
             @Override
             public void onSuccess(ResultBean resultBean, ResultBean.BizContent bizContent) {
-                FunHelper.closeKeyboard(etSearch);
+                //FunHelper.closeKeyboard(etSearch);
+                if (popupKeyboard != null) popupKeyboard.dismiss(CheckRunningWaterStep1Activity.this);
                 if (FunHelper.isEmpty(bizContent.cards)) {
                     postDelayed(CheckRunningWaterStep1Activity.this::showEmpty, 300);
                     return;
@@ -93,6 +95,7 @@ public class CheckRunningWaterStep1Activity extends AppActivity implements OnRef
 
             @Override
             public void onError(Response<Result> resp) {
+                if (popupKeyboard != null) popupKeyboard.dismiss(CheckRunningWaterStep1Activity.this);
                 showError(new StatusLayout.OnRetryListener() {
                     @Override
                     public void onRetry(StatusLayout layout) {

app/src/main/java/com/huntersun/vkyes/etcopencard/project/ui/activity/after/EditCarInfoStep1Activity.java

@@ -16,6 +16,7 @@ import com.huntersun.vkyes.etcopencard.project.utils.SearchCarInfoUtils;
 import com.huntersun.vkyes.etcopencard.src.aop.SingleClick;
 import com.huntersun.vkyes.etcopencard.src.app.AppActivity;
 import com.huntersun.vkyes.etcopencard.src.other.CodeCountDown;
+import com.parkingwang.keyboard.PopupKeyboard;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -29,12 +30,13 @@ import retrofit2.Response;
 public class EditCarInfoStep1Activity extends AppActivity {
     private ActivityEditCarInfoStep1Binding binding;
 
-    private EditText etSearch;
+    private PopupKeyboard popupKeyboard;
     private String curVehicleId;
     private ResultBean.BizContent curBizContent;
 
     private CodeCountDown mCountDownTimerUtils;
 
+
     @Override
     protected View getLayoutView() {
         binding = ActivityEditCarInfoStep1Binding.inflate(getLayoutInflater());
@@ -46,8 +48,8 @@ public class EditCarInfoStep1Activity extends AppActivity {
         binding.LLUserInfo.setVisibility(View.GONE);
         new SearchCarInfoUtils(this, new SearchCarInfoUtils.OnCustomReqCallback() {
             @Override
-            public void request(String vehicleId) {
-                //etSearch = et;
+            public void request(String vehicleId, PopupKeyboard mPopupKeyboard) {
+                popupKeyboard = mPopupKeyboard;
                 curVehicleId = vehicleId;
                 getCarInfo();
             }
@@ -77,7 +79,8 @@ public class EditCarInfoStep1Activity extends AppActivity {
         MyRetrofit.newInstance(IFCode.IFCODE154, params, new MyRetrofit.ReturnResult() {
             @Override
             public void onSuccess(ResultBean resultBean, ResultBean.BizContent bizContent) {
-                FunHelper.closeKeyboard(etSearch);
+                //FunHelper.closeKeyboard(etSearch);
+                if (popupKeyboard != null) popupKeyboard.dismiss(EditCarInfoStep1Activity.this);
                 if (bizContent == null || FunHelper.isEmpty(bizContent.vehicles)) {
                     toast("车俩信息不存在");
                     return;
@@ -89,6 +92,7 @@ public class EditCarInfoStep1Activity extends AppActivity {
 
             @Override
             public void onError(Response<Result> resp) {
+                if (popupKeyboard != null) popupKeyboard.dismiss(EditCarInfoStep1Activity.this);
                 binding.LLUserInfo.setVisibility(View.GONE);
             }
         });

app/src/main/java/com/huntersun/vkyes/etcopencard/project/utils/SearchCarInfoUtils.java

@@ -266,8 +266,8 @@ public class SearchCarInfoUtils {
         }
 
         if (reqCallback != null) {
-            reqCallback.request(inputView.getNumber() + "_" + vehiclePlateColor);
-            reqCallback.request(inputView.getNumber() , vehiclePlateColor);
+            reqCallback.request(inputView.getNumber() + "_" + vehiclePlateColor,mPopupKeyboard);
+            reqCallback.request(inputView.getNumber() , vehiclePlateColor,mPopupKeyboard);
             return;
         }
 
@@ -311,7 +311,7 @@ public class SearchCarInfoUtils {
 
     //自定义请求
     public interface OnCustomReqCallback {
-        default void request(String vehicleId){};
-        default void request(String vehicle,int vehicleColor){};
+        default void request(String vehicleId,PopupKeyboard mPopupKeyboard){};
+        default void request(String vehicle,int vehicleColor,PopupKeyboard mPopupKeyboard){};
     }
 }

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

@@ -240,7 +240,7 @@
             </LinearLayout>
         </LinearLayout>
 
-       <RelativeLayout
+       <LinearLayout
           style="@style/MatchWrap.Horizontal"
            android:layout_marginTop="@dimen/dp_10"
            android:gravity="center_vertical">
@@ -255,7 +255,8 @@
            <Button
                android:id="@+id/btnSearch"
                style="@style/BtnShortStyle"
-               android:layout_width="match_parent"
+               android:layout_width="0dp"
+               android:layout_weight="1"
                android:layout_height="@dimen/dp_35"
                android:layout_gravity="center_vertical|right"
                android:text="搜索"
@@ -263,6 +264,6 @@
                android:layout_alignParentRight="true"
                android:layout_marginLeft="@dimen/dp_5"
                android:textSize="@dimen/sp_12" />
-       </RelativeLayout>
+       </LinearLayout>
     </LinearLayout>
 </LinearLayout>