diff --git a/app/src/main/java/com/casic/dcms/view/BridgeMaintainActivity.java b/app/src/main/java/com/casic/dcms/view/BridgeMaintainActivity.java index 77825af..817fe40 100644 --- a/app/src/main/java/com/casic/dcms/view/BridgeMaintainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/BridgeMaintainActivity.java @@ -2,6 +2,7 @@ import android.content.Context; import android.text.TextUtils; +import android.util.Log; import android.view.View; import androidx.core.content.ContextCompat; @@ -37,6 +38,7 @@ public class BridgeMaintainActivity extends AndroidxBaseActivity { + private static final String TAG = "BridgeMaintainActivity"; private final Context context = BridgeMaintainActivity.this; private BridgeViewModel bridgeViewModel; private String bridgeId = ""; @@ -135,27 +137,25 @@ StringHub.show(context, "请选择养护的内容"); return; } - double[] gcjToWgs = LocationHelper.gcjToWgs( - aMapLocation.getLongitude(), - aMapLocation.getLatitude() - ); - LatLonPoint latLonPoint = new LatLonPoint(gcjToWgs[1], gcjToWgs[0]); + LatLonPoint latLonPoint = new LatLonPoint(aMapLocation.getLatitude(), aMapLocation.getLongitude()); LocationHelper.antiCodingLocation(context, latLonPoint, new IAddressListener() { @Override public void onGetAddress(String address) { + Log.d(TAG, "onGetAddress: " + address); SaveKeyValues.putValue("maintainAddress", address); + + //提交养护记录 + bridgeViewModel.submitMaintain( + bridgeId, + maintainContent, + viewBinding.maintainDateView.getText().toString(), + StringHelper.getUserBean().getId(), + String.valueOf(aMapLocation.getLongitude()), + String.valueOf(aMapLocation.getLatitude()), + StringHub.filterSpaceOrEnter(viewBinding.remarksView.getText().toString()) + ); } }); - //提交养护记录 - bridgeViewModel.submitMaintain( - bridgeId, - maintainContent, - viewBinding.maintainDateView.getText().toString(), - StringHelper.getUserBean().getId(), - String.valueOf(gcjToWgs[0]), - String.valueOf(gcjToWgs[1]), - StringHub.filterSpaceOrEnter(viewBinding.remarksView.getText().toString()) - ); } }, true); } diff --git a/app/src/main/java/com/casic/dcms/view/BridgeMaintainActivity.java b/app/src/main/java/com/casic/dcms/view/BridgeMaintainActivity.java index 77825af..817fe40 100644 --- a/app/src/main/java/com/casic/dcms/view/BridgeMaintainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/BridgeMaintainActivity.java @@ -2,6 +2,7 @@ import android.content.Context; import android.text.TextUtils; +import android.util.Log; import android.view.View; import androidx.core.content.ContextCompat; @@ -37,6 +38,7 @@ public class BridgeMaintainActivity extends AndroidxBaseActivity { + private static final String TAG = "BridgeMaintainActivity"; private final Context context = BridgeMaintainActivity.this; private BridgeViewModel bridgeViewModel; private String bridgeId = ""; @@ -135,27 +137,25 @@ StringHub.show(context, "请选择养护的内容"); return; } - double[] gcjToWgs = LocationHelper.gcjToWgs( - aMapLocation.getLongitude(), - aMapLocation.getLatitude() - ); - LatLonPoint latLonPoint = new LatLonPoint(gcjToWgs[1], gcjToWgs[0]); + LatLonPoint latLonPoint = new LatLonPoint(aMapLocation.getLatitude(), aMapLocation.getLongitude()); LocationHelper.antiCodingLocation(context, latLonPoint, new IAddressListener() { @Override public void onGetAddress(String address) { + Log.d(TAG, "onGetAddress: " + address); SaveKeyValues.putValue("maintainAddress", address); + + //提交养护记录 + bridgeViewModel.submitMaintain( + bridgeId, + maintainContent, + viewBinding.maintainDateView.getText().toString(), + StringHelper.getUserBean().getId(), + String.valueOf(aMapLocation.getLongitude()), + String.valueOf(aMapLocation.getLatitude()), + StringHub.filterSpaceOrEnter(viewBinding.remarksView.getText().toString()) + ); } }); - //提交养护记录 - bridgeViewModel.submitMaintain( - bridgeId, - maintainContent, - viewBinding.maintainDateView.getText().toString(), - StringHelper.getUserBean().getId(), - String.valueOf(gcjToWgs[0]), - String.valueOf(gcjToWgs[1]), - StringHub.filterSpaceOrEnter(viewBinding.remarksView.getText().toString()) - ); } }, true); } diff --git a/app/src/main/java/com/casic/dcms/view/PermissionActivity.java b/app/src/main/java/com/casic/dcms/view/PermissionActivity.java index ad2c683..77e2aaa 100644 --- a/app/src/main/java/com/casic/dcms/view/PermissionActivity.java +++ b/app/src/main/java/com/casic/dcms/view/PermissionActivity.java @@ -1,15 +1,16 @@ package com.casic.dcms.view; -import android.content.Intent; import android.view.View; import androidx.annotation.NonNull; +import com.amap.api.services.core.ServiceSettings; import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityPermssionBinding; import com.casic.dcms.utils.LocaleConstant; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.hub.ContextHub; import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; @@ -52,7 +53,10 @@ } private void startSplashScreenActivity() { - startActivity(new Intent(this, SplashScreenActivity.class)); + //先把导航隐私政策声明,后面导航会用到 + ServiceSettings.updatePrivacyShow(this, true, true); + ServiceSettings.updatePrivacyAgree(this, true); + ContextHub.navigatePageTo(this, SplashScreenActivity.class); finish(); }