Skip to content

Commit d1bda50

Browse files
TxiaozheTxiaozhe
committed
调试网络服务
1 parent f5ce0ea commit d1bda50

File tree

9 files changed

+126
-170
lines changed

9 files changed

+126
-170
lines changed

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

+9-3
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,13 @@ public class GlobalConfig {
2525
public static final String SERVER_IP = "211.143.78.218:7044";
2626
public static final int NET_TIMEOUT_MS = 6000;
2727
public static final String NAMESPACE = "http://tempuri.org/";
28-
public static final String WEBSERVICE_URL = "http://211.143.78.218:7044//pcj_cloudtrain_ws//Service1.asmx";
29-
public static final String METHOD_NAME = "ReceiveInspecteWorkMainWithGPS";
30-
28+
public static final String WEBSERVICE_URL = "http://211.143.78.218:7044//pcj_cloudtrain_ws//Service1.asmx";
29+
public static final String METHOD_NAME = "ReceiveHeatImageInfoWithGPS";
30+
31+
//数据库
32+
public static final String DB_NAME = "heat_images_info.db";
33+
public static final int DATABASE_VERSION = 1;
34+
public static final String TABLE_COLUMN_NAMES = "isUpload TEXT, teleimei TEXT, barcode TEXT, " +
35+
"path TEXT, imagename TEXT, imagetime TEXT, maxtemperature TEXT, " +
36+
"maxtemplocalx TEXT, maxtemplocaly TEXT, meantemperature TEXT)";
3137
}

‎app/src/main/java/com/flir/flirone/PreviewActivity.java

+68-136
Large diffs are not rendered by default.

‎app/src/main/java/com/flir/flirone/dbhelper/DBHelper.java

+5-9
Original file line numberDiff line numberDiff line change
@@ -4,24 +4,20 @@
44
import android.database.sqlite.SQLiteDatabase;
55
import android.database.sqlite.SQLiteOpenHelper;
66

7-
public class DBHelper extends SQLiteOpenHelper {
7+
import com.flir.flirone.GlobalConfig;
88

9-
private static final String DATABASE_NAME = "images_info.db";
10-
private static final int DATABASE_VERSION = 1;
9+
public class DBHelper extends SQLiteOpenHelper {
1110

1211
public DBHelper(Context context) {
1312
//CursorFactory设置为null,使用默认值
14-
super(context, DATABASE_NAME, null, DATABASE_VERSION);
13+
super(context, GlobalConfig.DB_NAME, null, GlobalConfig.DATABASE_VERSION);
1514
}
1615

1716
//数据库第一次被创建时onCreate会被调用
1817
@Override
1918
public void onCreate(SQLiteDatabase db) {
20-
db.execSQL("CREATE TABLE IF NOT EXISTS images" +
21-
"(_id INTEGER PRIMARY KEY AUTOINCREMENT, " +
22-
"name TEXT, path TEXT, type TEXT, size TEXT, time TEXT, " +
23-
"maxTemp TEXT, maxTempX TEXT, maxTempY TEXT," +
24-
"averageTemp TEXT)");
19+
db.execSQL("CREATE TABLE IF NOT EXISTS heatimages" +
20+
" (_id INTEGER PRIMARY KEY AUTOINCREMENT, " + GlobalConfig.TABLE_COLUMN_NAMES);
2521
}
2622

2723
//如果DATABASE_VERSION值被改为2,系统发现现有数据库版本不同,即会调用onUpgrade

‎app/src/main/java/com/flir/flirone/dbhelper/DBManager.java

+28-18
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,11 @@
1414
* Created by txiaozhe on 12/02/2017.
1515
*/
1616

17+
/**
18+
* 数据库名：images_info.db
19+
* 表名：images
20+
*/
21+
1722
public class DBManager {
1823
private DBHelper helper;
1924
private SQLiteDatabase db;
@@ -25,19 +30,20 @@ public DBManager(Context context) {
2530
db = helper.getWritableDatabase();
2631
}
2732

28-
public void add(List<MyImage> images) {
33+
public int add(MyImage image) {
34+
int stateCode = 0;
2935
db.beginTransaction(); //开始事务
3036
try {
31-
for (MyImage image : images) {
32-
db.execSQL("INSERT INTO images VALUES(null, ?, ?, ?, ?, ?, ?, ?, ?, ?)", new Object[]{image.getImagename(),
33-
image.getPath(), image.getType(), image.getSize(), image.getImagetime(),
34-
image.getMaxtemperature(), image.getMaxtemplocalx(), image.getMaxtemplocaly(),
35-
image.getMeantemperature()});
36-
}
37+
db.execSQL("INSERT INTO heatimages VALUES(null, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)", new Object[]{image.getIsUpLoad(),
38+
image.getTeleimei(), image.getBarcode(), image.getPath(), image.getImagename(),
39+
image.getImagetime(), image.getMaxtemperature(), image.getMaxtemplocalx(),
40+
image.getMaxtemplocaly(), image.getMeantemperature()});
3741
db.setTransactionSuccessful(); //设置事务成功完成
3842
} finally {
39-
db.endTransaction(); //结束事务
43+
db.endTransaction();//结束事务
44+
stateCode = -1;
4045
}
46+
return stateCode;
4147
}
4248

4349
public void updateAge(MyImage image) {
@@ -52,35 +58,39 @@ public void deleteOldPerson(MyImage image) {
5258

5359
/**
5460
* query all persons, return list
61+
*
5562
* @return List<Person>
5663
*/
5764
public List<MyImage> query() {
5865
ArrayList<MyImage> images = new ArrayList<MyImage>();
5966
Cursor c = queryTheCursor();
6067
while (c.moveToNext()) {
6168
MyImage image = new MyImage();
62-
image.setImagename(c.getString(c.getColumnIndex("name")));
69+
image.setIsUpLoad(c.getString(c.getColumnIndex("isUpload")));
70+
image.setTeleimei(c.getString(c.getColumnIndex("teleimei")));
71+
image.setBarcode(c.getString(c.getColumnIndex("barcode")));
6372
image.setPath(c.getString(c.getColumnIndex("path")));
64-
image.setType(c.getString(c.getColumnIndex("type")));
65-
image.setSize(c.getString(c.getColumnIndex("size")));
66-
image.setImagetime(c.getString(c.getColumnIndex("time")));
67-
image.setMaxtemperature(c.getString(c.getColumnIndex("maxTemp")));
68-
image.setMaxtemplocalx(c.getString(c.getColumnIndex("maxTempX")));
69-
image.setMaxtemplocaly(c.getString(c.getColumnIndex("maxTempY")));
70-
image.setMeantemperature(c.getString(c.getColumnIndex("averageTemp")));
73+
image.setImagename(c.getString(c.getColumnIndex("imagename")));
74+
image.setImagetime(c.getString(c.getColumnIndex("imagetime")));
75+
image.setMaxtemperature(c.getString(c.getColumnIndex("maxtemperature")));
76+
image.setMaxtemplocalx(c.getString(c.getColumnIndex("maxtemplocalx")));
77+
image.setMaxtemplocaly(c.getString(c.getColumnIndex("maxtemplocaly")));
78+
image.setMeantemperature(c.getString(c.getColumnIndex("meantemperature")));
7179

7280
images.add(image);
7381
}
7482
c.close();
83+
closeDB();
7584
return images;
7685
}
7786

7887
/**
7988
* query all persons, return cursor
80-
* @return Cursor
89+
*
90+
* @return Cursor
8191
*/
8292
public Cursor queryTheCursor() {
83-
Cursor c = db.rawQuery("SELECT * FROM images", null);
93+
Cursor c = db.rawQuery("SELECT * FROM heatimages", null);
8494
return c;
8595
}
8696

‎app/src/main/java/com/flir/flirone/imagehelp/ImageHelp.java

+6-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import android.graphics.Bitmap;
44
import android.graphics.BitmapFactory;
55
import android.media.ThumbnailUtils;
6+
import android.util.Base64;
67
import android.util.Log;
78

89
import java.io.BufferedInputStream;
@@ -173,10 +174,14 @@ public byte[] getFileToByte(File file) {
173174
ch = is.read(bb);
174175
}
175176
by = bytestream.toByteArray();
177+
178+
Log.i("uploadservice_image", "length:" + by.length);
176179
} catch (Exception ex) {
177180
ex.printStackTrace();
178181
}
179182

180-
return by;
183+
return Base64.encode(by, Base64.DEFAULT);
181184
}
185+
186+
182187
}

‎app/src/main/java/com/flir/flirone/imagehelp/MyImage.java

+3
Original file line numberDiff line numberDiff line change
@@ -190,6 +190,7 @@ public String toString() {
190190
", teleimei='" + teleimei + '\'' +
191191
", barcode='" + barcode + '\'' +
192192
", heatimage=" + heatimage +
193+
", imagepath=" + path +
193194
", imagename='" + imagename + '\'' +
194195
", imagetime='" + imagetime + '\'' +
195196
", maxtemperature='" + maxtemperature + '\'' +
@@ -198,4 +199,6 @@ public String toString() {
198199
", meantemperature='" + meantemperature + '\'' +
199200
'}';
200201
}
202+
203+
201204
}

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

+4-3
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,11 @@ public void onCreate() {
4949
File[] files = imageHelp.getFiles();
5050
Log.i("uploadservice_image", files.length + "");
5151
try{
52-
byte[] bytes = imageHelp.getFileToByte(files[0]);
52+
byte[] bytes = imageHelp.getFileToByte(files[files.length - 1]);
53+
Log.i("uploadservice_image", "base64 length:" + bytes.length);
5354
Log.i("uploadservice_image", files[0].getPath());
54-
Log.i("uploadservice_image", bytes[0] + "");
55-
webServiceCall.request.addProperty("heatimage", "bytes"); // 图像
55+
Log.i("uploadservice_image", new String(bytes, "UTF-8"));
56+
webServiceCall.request.addProperty("heatimage", new String(bytes, "UTF-8")); // 图像
5657
} catch (Exception e) {
5758
Log.i("uploadservice_image", e.toString());
5859
}

‎heat_images_info.db

Whitespace-only changes.

‎sqlite.sh

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
#!/bin/bash
2+
adb -d shell 'run-as com.flir.flirone cat /data/data/com.flir.flirone/databases/heat_images_info.db> /sdcard/heat_images_info.db'
3+
adb pull /sdcard/heat_images_info.db .

0 commit comments

Comments
 (0)