联调1

Author: Txiaozhe

app/src/main/java/com/flir/flirone/GlobalConfig.java

@@ -36,6 +36,8 @@ public class GlobalConfig {
     public static final String MAX_TEMP_X = "maxtemplocalx"; //最高温度x坐标
     public static final String MAX_TEMP_Y = "maxtemplocaly"; //最高温度y坐标
     public static final String AVERAGE_TEMP = "meantemperature"; //平均温度
+    public static final String TELELONG = "telelong";
+    public static final String TELELAT = "telelat";
 
     //数据库
     public static final String DB_NAME = "heat_images_info.db";

app/src/main/java/com/flir/flirone/NfcHandlerActivity.java

@@ -62,7 +62,7 @@ public void run() {
                 if (NfcAdapter.ACTION_NDEF_DISCOVERED.equals(getIntent().getAction())) {
                     NfcInfo nfcInfo = readFromTag(getIntent());
                     nfcResult = nfcInfo.readResult;
-                    nfcTView.setText("NFC扫描结果：" + nfcResult + "\n当前车厢号：硬卧1234");
+                    nfcTView.setText("NFC扫描结果：" + nfcResult);
                 }
             }
         }).start();

app/src/main/java/com/flir/flirone/networkhelp/UpLoadService.java

@@ -96,7 +96,9 @@ public void run() {
                 while (true) {
                     try {
                         Thread.sleep(TIME_DELAYED);
-                        startService(intent);
+
+                        Intent s = new Intent(UpLoadService.this, UpLoadService.class);
+                        startService(s);
                     } catch (InterruptedException e) {
                         e.printStackTrace();
                     }
@@ -126,15 +128,23 @@ private boolean request(WebServiceCall call, ImageHelp imageHelp, ImageInfo imag
             call.request.addProperty(GlobalConfig.PHONE_TAG, phoneId); //手机串号
             call.request.addProperty(GlobalConfig.NFC_TAG, imageInfo.getNfcCode());
             call.request.addProperty(GlobalConfig.IMAGE, image);
-            call.request.addProperty(GlobalConfig.IMAGE_NAME, imageInfo.getName());
+            call.request.addProperty(GlobalConfig.IMAGE_NAME, imageInfo.getName() + ".jpg");
             call.request.addProperty(GlobalConfig.IMAGE_TIME, imageHelp.getTimeFromName(imageInfo.getName()));
-            call.request.addProperty(GlobalConfig.MAX_TEMP, imageInfo.getMaxTemp());
+            int maxTempDot = imageInfo.getMaxTemp().indexOf(".") + 3;
+            call.request.addProperty(GlobalConfig.MAX_TEMP, imageInfo.getMaxTemp().substring(0, maxTempDot));
             call.request.addProperty(GlobalConfig.MAX_TEMP_X, imageInfo.getMaxTempX());
             call.request.addProperty(GlobalConfig.MAX_TEMP_Y, imageInfo.getMaxTempY());
-            call.request.addProperty(GlobalConfig.AVERAGE_TEMP, imageInfo.getAverTemp());
+            int averTempDot = imageInfo.getAverTemp().indexOf(".") + 3;
+            call.request.addProperty(GlobalConfig.AVERAGE_TEMP, imageInfo.getAverTemp().substring(0, averTempDot));
+            call.request.addProperty(GlobalConfig.TELELONG, "90");
+            call.request.addProperty(GlobalConfig.TELELAT, "90");
+
+            Log.i("temp", imageInfo.getMaxTemp().substring(0, maxTempDot));
+            Log.i("temp11", imageInfo.getMaxTemp());
 
             try {
                 String result = webServiceCall.callWebMethod().toString();
+                Log.i("upload", result);
                 int result_code = Integer.parseInt(result);
                 if (result_code > 0) {
                     isSuccess = true;
@@ -165,6 +175,8 @@ private boolean request(WebServiceCall call, ImageHelp imageHelp, ImageInfo imag
     @Override
     public void onDestroy() {
         super.onDestroy();
+
+        Log.i("temp", "UpLoadService onDestroy");
     }
 
     @Override