Commit b81b206c authored by Administrator's avatar Administrator

精确定位

parent fa87219c
......@@ -8,8 +8,8 @@ android {
applicationId "com.virjar.ratel.virtuallocation"
minSdkVersion 19
targetSdkVersion 28
versionCode 20200930
versionName "v1.1"
versionCode 20210419
versionName "v1.2"
archivesBaseName = "JDY_${versionName}".replace(' ', '_')
ndk {
abiFilters "armeabi-v7a", "arm64-v8a"//, "x86","arm64-v8a","x86_64"
......
......@@ -263,7 +263,8 @@ public class MainActivity extends BaseActivity implements View.OnClickListener {
mPreciseLocation.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
PreciseLocationActivity.openActivity(MainActivity.this);
Intent intent = new Intent(MainActivity.this, PreciseLocationActivity.class);
startActivityForResult(intent, PreciseLocationActivity.PRECISE_LOCATION_RESULT_FLAG);
}
});
mAddProcess.setOnClickListener(new View.OnClickListener() {
......@@ -526,7 +527,14 @@ public class MainActivity extends BaseActivity implements View.OnClickListener {
}
poiSearchCityTextView.setText(cityInfoBean.getName());
beginSearch(poiSearchEditText.getText());
}
} else if (requestCode == PreciseLocationActivity.PRECISE_LOCATION_RESULT_FLAG) {
Bundle bundle = data.getExtras();
if (resultCode == RESULT_OK) {
double lat = bundle.getDouble("lat");
double lng = bundle.getDouble("lng");
LatLng latLng = new LatLng(lat, lng);
setCurrentMapLatLng(latLng);
}
}
}
......
......@@ -10,6 +10,7 @@ import android.content.Intent;
import android.os.Bundle;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.AppCompatButton;
import android.text.TextUtils;
import android.view.View;
import android.view.ViewGroup;
import android.view.animation.AccelerateDecelerateInterpolator;
......@@ -18,6 +19,7 @@ import android.widget.ProgressBar;
import android.widget.TextView;
import android.widget.Toast;
import com.lljjcoder.style.citylist.CityListSelectActivity;
import com.virjar.ratel.virtuallocation.R;
import top.littlerich.virtuallocation.presenter.JellyInterpolator;
......@@ -32,6 +34,7 @@ public class PreciseLocationActivity extends AppCompatActivity {
private ProgressBar mPbLocating;
private TextView mTip;
float width;
public static final int PRECISE_LOCATION_RESULT_FLAG = 4564;
@Override
protected void onCreate(Bundle savedInstanceState) {
......@@ -68,10 +71,13 @@ public class PreciseLocationActivity extends AppCompatActivity {
mPbLocating.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
showTip("精确定位", View.GONE);
mPbLocating.setVisibility(View.GONE);
mBeginLocation.setVisibility(View.VISIBLE);
repaintView(mBeginLocation);
}
});
}
......@@ -169,6 +175,30 @@ public class PreciseLocationActivity extends AppCompatActivity {
}
});
String longitudeStr = mLongitudeValue.getText().toString().trim();
String latitudeStr = mLatitudeValue.getText().toString().trim();
if (longitudeStr.isEmpty()
|| latitudeStr.isEmpty()) {
Toast.makeText(PreciseLocationActivity.this, "请输入:", Toast.LENGTH_SHORT).show();
return;
}
try {
Double.parseDouble(longitudeStr);
Double.parseDouble(latitudeStr);
} catch (NumberFormatException e) {
Toast.makeText(PreciseLocationActivity.this, "格式不合法:", Toast.LENGTH_SHORT).show();
return;
}
Intent intent = new Intent();
Bundle bundle = new Bundle();
bundle.putDouble("lat", Double.parseDouble(latitudeStr));
bundle.putDouble("lng", Double.parseDouble(longitudeStr));
intent.putExtras(bundle);
PreciseLocationActivity.this.setResult(-1, intent);
PreciseLocationActivity.this.finish();
}
private void showTip(String title, int isVisible) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment