修改充电页面的请求

home/src/main/java/com/snc/home/ui/HomeFragment.java

@@ -356,6 +356,8 @@ public class HomeFragment extends BaseFragment<FragmentHomeBinding> implements M
                         LogUtils.e(chargePointId + "：" + throwable.getMessage());
                     }
                 });
+
+
     }
 
     @Override

lib_base/src/main/java/com/snc/base/http/api/TriggerMessageReqApi.java

@@ -1,26 +1,27 @@
 package com.snc.base.http.api;
 
 import androidx.annotation.NonNull;
-
 import com.hjq.http.config.IRequestApi;
+import com.snc.base.utils.LogUtils;
 
 /**
- * 触发消息
+ * 触发消息请求 API 类
  */
 public class TriggerMessageReqApi implements IRequestApi {
+
     @NonNull
     @Override
     public String getApi() {
-        return "/triggerMessageReq";
+        StringBuilder apiPath = new StringBuilder("/triggerMessageReq");
+        if (chargePointId != null && !chargePointId.isEmpty()) {
+            apiPath.append("?chargePointId=").append(chargePointId);
+        }
+        LogUtils.e("============>"+apiPath.toString());
+        return apiPath.toString();
     }
 
     private String chargePointId;
-
-    /**
-     * mwareStatusNotification-固件升级状态通知，Heartbeat-心跳通知，MeterValues-实时数据，StatusNotification-状态通知）
-     */
     private String requestedMessage;
-
     private String connectorId = "1";
 
     public TriggerMessageReqApi setChargePointId(String chargePointId) {
@@ -29,6 +30,7 @@ public class TriggerMessageReqApi implements IRequestApi {
     }
 
     public TriggerMessageReqApi setRequestedMessage(String requestedMessage) {
+        LogUtils.e("==================>" + requestedMessage);
         this.requestedMessage = requestedMessage;
         return this;
     }

lib_base/src/main/java/com/snc/base/http/server/ReleaseServer.java

@@ -33,6 +33,6 @@ public class ReleaseServer implements IRequestServer {
     @Override
     public CacheMode getCacheMode() {
         // 只在请求失败才去读缓存
-        return CacheMode.USE_CACHE_AFTER_FAILURE;
+        return CacheMode.NO_CACHE;
     }
 }

mian/src/main/java/com/snc/mian/ui/ChargingActivity.java

@@ -58,6 +58,7 @@ import com.snc.base.http.exception.FailedException;
 import com.snc.base.http.exception.RejectedException;
 import com.snc.base.http.exception.TokenException;
 import com.snc.base.http.model.BaseBean;
+import com.snc.base.http.model.HttpCacheManager;
 import com.snc.base.http.model.HttpData;
 import com.snc.base.mqtt.MqttConnecListener;
 import com.snc.base.mqtt.MqttManager;
@@ -464,6 +465,7 @@ public class ChargingActivity extends BaseActivity<ActivityChargingBinding> impl
                                         Animation();
                                         isExecuted = true; // 设置标志位为 true，表示方法已经执行过一次
                                     }
+
                                     MqttManager.getInstance(getBaseContext()).setConnected(true);
                                     break;
                                 case "Finishing": //充电完成
@@ -717,12 +719,13 @@ public class ChargingActivity extends BaseActivity<ActivityChargingBinding> impl
     private void triggerMessageReq() {
         if (deviceListbean.getDevice() != null) {
             showLoading();
-            if (deviceListbean.getDevice().getConnector().getConnectorStatus().equals("Charging")) {
+           // if (deviceListbean.getDevice().getConnector().getConnectorStatus().equals("Charging")) {
                 LogUtils.e("正在充电中Charging状态");
                 EasyHttp.post(this)
                         .api(new TriggerMessageReqApi()
-                                .setChargePointId(deviceListbean.getChargePointId())
+                                .setChargePointId(deviceListbean.getChargePointId()) // 设置 GET 请求参数 chargePointId
-                                .setRequestedMessage("Heartbeat"))
+                                .setConnectorId("1")
+                                .setRequestedMessage("MeterValues"))
                         .request(new OnHttpListener<HttpData<BaseBean>>() {
                             @Override
                             public void onHttpSuccess(HttpData<BaseBean> result) {
@@ -731,39 +734,17 @@ public class ChargingActivity extends BaseActivity<ActivityChargingBinding> impl
                                 if (result.isRequestSuccess()) {
                                     MqttManager.getInstance(getBaseContext()).setConnected(true);
                                 }
-
                             }
 
                             @Override
                             public void onHttpFail(Throwable throwable) {
                                 hideLoading();
-//                                if (throwable instanceof RejectedException) {
+                                LogUtils.e("触发消息失败" + deviceListbean.getChargePointId());
-//                                    MqttManager.getInstance(getBaseContext()).setConnected(false);
-//                                    TipsSingleDialog(throwable.getMessage());
-//                                    mBinding.topll.topimg.setImageResource(R.drawable.lanyac);
-//                                } else if (throwable.getMessage().equals("timeout")) {
-//                                    TipsSingleDialog("The pile is not connected to the platform. Please delete the device and register it again according to the correct process");
-//                                    LogUtils.e("触发消息失败" + deviceListbean.getChargePointId() + "：" + throwable.getMessage());
-//                                    if (bleCore.isConnected() && (bleCore.getDevice().getAddress()).equals((deviceListbean.getDevice().getDeviceBluetoothMac()))) {
-//                                        MqttManager.getInstance(getBaseContext()).setConnected(false);
-//                                        mBinding.topll.topimg.setImageResource(R.drawable.lanyac);
-//                                        sendBluetoothMsg(0, JsonHandleUtils.setBleChargeStatusRequestJson(2, deviceListbean.getidTag()), serviceManager.getServiceList().get(2).getCharacteristics());
-//                                    } else {
-//                                        mBinding.topll.topimg.setVisibility(View.GONE);
-//                                    }
-//                                } else {
-//                                    if (bleCore.isConnected() && (bleCore.getDevice().getAddress()).equals((deviceListbean.getDevice().getDeviceBluetoothMac()))) {
-//                                        MqttManager.getInstance(getBaseContext()).setConnected(false);
-//                                        mBinding.topll.topimg.setImageResource(R.drawable.lanyac);
-//                                        sendBluetoothMsg(0, JsonHandleUtils.setBleChargeStatusRequestJson(2, deviceListbean.getidTag()), serviceManager.getServiceList().get(2).getCharacteristics());
-//                                    } else {
-//                                        mBinding.topll.topimg.setVisibility(View.GONE);
-//                                    }
-//                                    TipsSingleDialog(throwable.getMessage());
-//                                }
                             }
                         });
-            } else {
+
+
+          //  } else {
                 LogUtils.e("其他状态获取StatusNotification");
                 EasyHttp.post(this)
                         .api(new TriggerMessageReqApi()
@@ -807,7 +788,7 @@ public class ChargingActivity extends BaseActivity<ActivityChargingBinding> impl
 //                                }
                             }
                         });
-            }
+           // }
 
         }
 
@@ -988,5 +969,36 @@ public class ChargingActivity extends BaseActivity<ActivityChargingBinding> impl
                 }
                 break;
         }
+    }
+
+    public void trik(View view) {
+
+LogUtils.e("----------->"+deviceListbean.getChargePointId());
+        EasyHttp.post(this)
+                .api(new TriggerMessageReqApi()
+                        .setChargePointId(deviceListbean.getChargePointId()) // 设置 GET 请求参数 chargePointId
+                        .setConnectorId("1") // 设置 POST 请求的 form-data 参数 connectorId
+                        .setRequestedMessage("MeterValues")) // 设置 POST 请求的 form-data 参数 requestedMessage
+                .request(new OnHttpListener<HttpData<BaseBean>>() {
+                    @Override
+                    public void onHttpSuccess(HttpData<BaseBean> result) {
+                        hideLoading();
+
+                        LogUtils.e("触发消息成功" + deviceListbean.getChargePointId() + "：" + result.getReason());
+                        if (result.isRequestSuccess()) {
+                            MqttManager.getInstance(getBaseContext()).setConnected(true);
+                        }
+                    }
+
+                    @Override
+                    public void onHttpFail(Throwable throwable) {
+                        hideLoading();
+                        LogUtils.e("触发消息失败" + deviceListbean.getChargePointId());
+                    }
+                });
+
+
+
+
     }
 }

mian/src/main/res/layout/activity_charging.xml

@@ -234,6 +234,14 @@
                 android:layout_marginEnd="14dp"
                 android:src="@drawable/list_right" />
         </LinearLayout>
+        <Button
+            android:visibility="gone"
+            android:onClick="trik"
+            app:layout_constraintRight_toRightOf="parent"
+            android:text="测试"
+            app:layout_constraintTop_toTopOf="parent"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"/>
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>