名称修改

Sheedon · Jun 20, 2020 · 422e093 · 422e093
1 parent 6d7fbad
commit 422e093
Show file tree

Hide file tree

Showing 5 changed files with 54 additions and 13 deletions.
diff --git a/app/src/main/java/org/sheedon/demo/MainActivity.java b/app/src/main/java/org/sheedon/demo/MainActivity.java
@@ -8,7 +8,12 @@
 import org.json.JSONException;
 import org.json.JSONObject;
 import org.sheedon.demo.factory.MqttClient;
+import org.sheedon.mqtt.Call;
 import org.sheedon.mqtt.Callback;
+import org.sheedon.mqtt.Observable;
+import org.sheedon.mqtt.OkMqttClient;
+import org.sheedon.mqtt.Request;
+import org.sheedon.mqtt.RequestBuilder;
 import org.sheedon.mqtt.Response;
 import org.sheedon.mqtt.ResponseBody;
 
@@ -19,7 +24,26 @@ protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
 
-        MqttClient.getInstance();
+        final OkMqttClient client = MqttClient.getInstance().getClient();
+
+        Request request = new RequestBuilder()
+                .backName("get_manager_list")
+                .build();
+
+        final Observable observable = client.newObservable(request);
+        observable.subscribe(new Callback<Response>() {
+            @Override
+            public void onFailure(Throwable e) {
+                System.out.println(e.getMessage());
+            }
+
+            @Override
+            public void onResponse(Response response) {
+                ResponseBody body = response.body();
+                System.out.println(body == null?"":body.getBody());
+                observable.cancel();
+            }
+        });
 
         findViewById(R.id.btn).setOnClickListener(new View.OnClickListener() {
             @Override
@@ -32,18 +56,36 @@ public void onClick(View v) {
                     e.printStackTrace();
                 }
 
-                MqttClient.getInstance().publish(jsonObject.toString(), "get_manager_list", new Callback() {
+                Request request = new RequestBuilder()
+                        .payload(jsonObject.toString())
+                        .backName("get_manager_list")
+                        .build();
+
+                Call call = client.newCall(request);
+                call.enqueue(new Callback<Response>() {
                     @Override
                     public void onFailure(Throwable e) {
-                        System.out.println(e.getMessage());
+
                     }
 
                     @Override
                     public void onResponse(Response response) {
-                        ResponseBody body = response.body();
-                        System.out.println(body == null?"":body.getBody());
+
                     }
                 });
+
+//                MqttClient.getInstance().publish(jsonObject.toString(), "get_manager_list", new Callback() {
+//                    @Override
+//                    public void onFailure(Throwable e) {
+//                        System.out.println(e.getMessage());
+//                    }
+//
+//                    @Override
+//                    public void onResponse(Response response) {
+//                        ResponseBody body = response.body();
+//                        System.out.println(body == null?"":body.getBody());
+//                    }
+//                });
             }
         });
     }

diff --git a/app/src/main/java/org/sheedon/demo/factory/MqttClient.java b/app/src/main/java/org/sheedon/demo/factory/MqttClient.java
@@ -43,20 +43,20 @@ private MqttClient() {
     private void createClient() {
         // 创建MqttClient
 
-        String clientId = "";// 设置设备编号
-        String serverUri = "";// 设置服务器地址
+        String clientId = "yhkhs20181029046";// 设置设备编号
+        String serverUri = "tcp://yanhang.kmdns.net:3883";// 设置服务器地址
 //        if (clientId == null || clientId.trim().equals(""))
 //            return;
 
         Queue<SubscribeBody> subscribeBodies = new ArrayDeque<>();
-        subscribeBodies.add(SubscribeBody.build("", 1));// 添加需要订阅主题
+        subscribeBodies.add(SubscribeBody.build("yh_classify/clouds/recyclable/cmd/yhkhs20181029046", 1));// 添加需要订阅主题
 
 
         if (mClient == null) {
             mClient = new OkMqttClient.Builder()
                     .clientInfo(App.getInstance(), serverUri, clientId)
                     .subscribeBodies(subscribeBodies)
-                    .baseTopic("")// 添加基础主题
+                    .baseTopic("yh_classify/device/recyclable/data/yhkhs20181029046")// 添加基础主题
                     .addConverterFactory(CallbackRuleConverterFactory.create())
                     .callback(this).build();
         }

diff --git a/mqtt/build.gradle b/mqtt/build.gradle
@@ -8,8 +8,8 @@ android {
     defaultConfig {
         minSdkVersion 15
         targetSdkVersion 28
-        versionCode 3
-        versionName "1.1.1"
+        versionCode 4
+        versionName "1.1.2"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles 'consumer-rules.pro'

diff --git a/mqtt/src/main/java/org/sheedon/mqtt/Dispatcher.java b/mqtt/src/main/java/org/sheedon/mqtt/Dispatcher.java
@@ -13,7 +13,6 @@
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.DelayQueue;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 

diff --git a/mqtt/src/main/java/org/sheedon/mqtt/TimeOutRunnable.java b/mqtt/src/main/java/org/sheedon/mqtt/TimeOutRunnable.java
@@ -46,7 +46,7 @@ protected void execute() {
             DelayEvent delayEvent = queue.poll();
             if (delayEvent != null && delayEvent.getId() != null
                     && !delayEvent.getId().equals("")) {
-                dispatcher.finishedByLocal(delayEvent.getId(), new TimeoutException("串口超时"));
+                dispatcher.finishedByLocal(delayEvent.getId(), new TimeoutException("网络超时"));
             }
         } while (queue.size() > 0);