|
|
@@ -174,9 +174,9 @@ class DBManager():
|
|
|
if data['info']['subType'] == 1:
|
|
|
data_block = np.array([data['info']['obdTime'],data['ffGps']['locationType'], data['ffGps']['satellites'],
|
|
|
data['ffGps']['latitude'],data['ffGps']['longitude'],data['ffGps']['speed'],
|
|
|
- data['ffGps']['altitude'], data['ffGps']['direction']]).reshape(1,8)
|
|
|
+ data['ffGps']['altitude'], data['ffGps']['direction'], data['ffGps']['mileage']]).reshape(1,9)
|
|
|
df = pd.DataFrame(
|
|
|
- columns=['时间戳','定位类型', '卫星数','纬度','经度','速度[km/h]','海拔','航向'],data=data_block)
|
|
|
+ columns=['时间戳','定位类型', '卫星数','纬度','经度','速度[km/h]','海拔','航向', '里程/m'],data=data_block)
|
|
|
elif data['info']['subType'] == 2:
|
|
|
df = pd.DataFrame(
|
|
|
columns=['时间戳','定位类型', '卫星数','纬度','经度','速度[km/h]','海拔','航向'])
|
|
|
@@ -251,7 +251,6 @@ class DBManager():
|
|
|
temp = len(line['ffBatteryStatus'].get('otherTempList', []))
|
|
|
if (temp > OtherTNum):
|
|
|
OtherTNum = temp
|
|
|
-
|
|
|
data_blocks = pd.DataFrame()
|
|
|
for line in data:
|
|
|
et = time.time()
|
