This commit is contained in:
ZhanGSKen 2025-03-21 01:38:52 +08:00
parent 76d6e7cf46
commit d44d553818
12 changed files with 41 additions and 16 deletions

View File

@ -1,8 +1,8 @@
#Created by .winboll/winboll_app_build.gradle
#Wed Mar 19 21:40:37 GMT 2025
#Thu Mar 20 12:32:45 GMT 2025
stageCount=0
libraryProject=
baseVersion=1.0
publishVersion=1.0.0
buildCount=260
buildCount=265
baseBetaVersion=1.0.1

View File

@ -7,10 +7,12 @@ package cc.winboll.studio.positions;
*/
import cc.winboll.studio.libappbase.GlobalApplication;
import cc.winboll.studio.libappbase.LogUtils;
import java.io.File;
public class App extends GlobalApplication {
public static final String TAG = "App";
public static String szDataFolder = "";
@Override
public void onCreate() {
@ -21,8 +23,16 @@ public class App extends GlobalApplication {
// 设置 WinBoll 应用 UI 类型
//WinBollActivityManager.getInstance(this).setWinBollUI_TYPE(WinBollActivityManager.WinBollUI_TYPE.Aplication);
LogUtils.d(TAG, "onCreate");
if (BuildConfig.DEBUG) {
szDataFolder = getExternalFilesDir(TAG).toString();
} else {
szDataFolder = getFilesDir().toString() + File.separator + TAG;
}
File fDataFolder = new File(szDataFolder);
if (!fDataFolder.exists()) {
fDataFolder.mkdirs();
}
LogUtils.d(TAG, String.format("Data path is : %s", szDataFolder));
}
}

View File

@ -29,7 +29,7 @@ import cc.winboll.studio.libapputils.view.YesNoAlertDialog;
import cc.winboll.studio.positions.R;
import cc.winboll.studio.positions.activities.JointPositioningActivity;
import cc.winboll.studio.positions.activities.SettingsActivity;
import cc.winboll.studio.positions.beans.MainServiceBean;
import cc.winboll.studio.positions.models.MainServiceBean;
import cc.winboll.studio.positions.fragments.LogFragment;
import cc.winboll.studio.positions.fragments.PositionsFragment;
import cc.winboll.studio.positions.fragments.TXMSFragment;

View File

@ -29,7 +29,7 @@ import cc.winboll.studio.libappbase.LogView;
import cc.winboll.studio.positions.R;
import cc.winboll.studio.positions.activities.SettingsActivity;
import cc.winboll.studio.positions.activities.TestMapViewActivity;
import cc.winboll.studio.positions.beans.PostionModel;
import cc.winboll.studio.positions.models.PostionModel;
import cc.winboll.studio.positions.utils.LocationFileStorage;
import com.google.android.material.floatingactionbutton.FloatingActionButton;
import com.google.android.material.snackbar.Snackbar;

View File

@ -31,7 +31,7 @@ import androidx.core.app.ActivityCompat;
import androidx.core.content.ContextCompat;
import androidx.fragment.app.Fragment;
import cc.winboll.studio.libappbase.LogUtils;
import cc.winboll.studio.positions.beans.PostionModel;
import cc.winboll.studio.positions.models.PostionModel;
import cc.winboll.studio.positions.utils.LocationFileStorage;
import com.tencent.map.geolocation.TencentLocation;
import com.tencent.map.geolocation.TencentLocationListener;

View File

@ -1,4 +1,4 @@
package cc.winboll.studio.positions.beans;
package cc.winboll.studio.positions.models;
/**
* @Author ZhanGSKen@AliYun.Com

View File

@ -1,4 +1,4 @@
package cc.winboll.studio.positions.beans;
package cc.winboll.studio.positions.models;
/**
* @Author ZhanGSKen@AliYun.Com

View File

@ -1,4 +1,4 @@
package cc.winboll.studio.positions.beans;
package cc.winboll.studio.positions.models;
/**
* @Author ZhanGSKen@AliYun.Com

View File

@ -13,7 +13,7 @@ import android.content.ServiceConnection;
import android.os.Binder;
import android.os.IBinder;
import cc.winboll.studio.libappbase.LogUtils;
import cc.winboll.studio.positions.beans.MainServiceBean;
import cc.winboll.studio.positions.models.MainServiceBean;
import cc.winboll.studio.positions.services.MainService;
public class AssistantService extends Service {

View File

@ -21,7 +21,7 @@ import cc.winboll.studio.libappbase.LogUtils;
import cc.winboll.studio.libappbase.sos.SOS;
import cc.winboll.studio.libappbase.sos.WinBoll;
import cc.winboll.studio.positions.App;
import cc.winboll.studio.positions.beans.MainServiceBean;
import cc.winboll.studio.positions.models.MainServiceBean;
import cc.winboll.studio.positions.handlers.MainServiceHandler;
import cc.winboll.studio.positions.receivers.MainReceiver;
import cc.winboll.studio.positions.services.MainService;

View File

@ -15,16 +15,18 @@ import java.util.ArrayList;
import java.util.List;
import org.json.JSONArray;
import cc.winboll.studio.libappbase.LogUtils;
import cc.winboll.studio.positions.beans.PostionModel;
import cc.winboll.studio.positions.models.PostionModel;
import cc.winboll.studio.positions.App;
import java.io.File;
public class LocationFileStorage {
public static final String TAG = "LocationFileStorage";
private static final String FILE_NAME = "locations.json";
static final String FILE_NAME = "locations.json";
public static void saveToFile(Context context, ArrayList<PostionModel> locations) {
try {
PostionModel.saveBeanList(context, locations, PostionModel.class);
PostionModel.saveBeanListToFile(getDataPath(), locations);
} catch (Exception e) {
LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
}
@ -33,10 +35,14 @@ public class LocationFileStorage {
public static ArrayList<PostionModel> loadFromFile(Context context) {
ArrayList<PostionModel> result = new ArrayList<PostionModel>();
try {
PostionModel.loadBeanList(context, result, PostionModel.class);
PostionModel.loadBeanListFromFile(getDataPath(), result, PostionModel.class);
} catch (Exception e) {
LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
}
return result;
}
static String getDataPath() {
return App.szDataFolder + File.separator + FILE_NAME;
}
}

View File

@ -5,9 +5,14 @@ package cc.winboll.studio.positions.utils;
* @Date 2025/03/11 09:36:52
* @Describe 定位数据融合类
*/
import cc.winboll.studio.positions.App;
import java.io.File;
public class LocationFusion {
public static final String TAG = "LocationFusion";
static final String FILE_NAME = "LocationFusionModel.json";
// 融合定位数据的方法
public static double[] fuseLocationData(double latitudeGPSLock, double longitudeGPSLock,
@ -28,4 +33,8 @@ public class LocationFusion {
// double[] fusedLocation = fuseLocationData(gpsLocation, wifiLocation, gpsWeight, wifiWeight);
// System.out.println("融合后的纬度: " + fusedLocation[0] + ", 经度: " + fusedLocation[1]);
// }
static String getDataPath() {
return App.szDataFolder + File.separator + FILE_NAME;
}
}