diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 0f88a0d..4e5bc37 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -13,6 +13,9 @@ + + @@ -39,7 +42,8 @@ android:theme="@style/Theme.STLink" android:networkSecurityConfig="@xml/network_security_config" android:requestLegacyExternalStorage="true" - android:largeHeap="true"> + android:largeHeap="true" + tools:targetApi="n"> diff --git a/app/src/main/java/com/example/stlink/activitys/fragmentChild/activityTeaHome/CreateSign.java b/app/src/main/java/com/example/stlink/activitys/fragmentChild/activityTeaHome/CreateSign.java index 1d3cffc..aaa9359 100644 --- a/app/src/main/java/com/example/stlink/activitys/fragmentChild/activityTeaHome/CreateSign.java +++ b/app/src/main/java/com/example/stlink/activitys/fragmentChild/activityTeaHome/CreateSign.java @@ -1,11 +1,16 @@ package com.example.stlink.activitys.fragmentChild.activityTeaHome; +import android.Manifest; import android.content.Intent; +import android.content.pm.PackageManager; import android.graphics.Bitmap; +import android.location.LocationManager; +import android.net.Uri; import android.os.Build; import android.os.Bundle; import android.os.Handler; import android.os.Message; +import android.provider.Settings; import android.text.TextUtils; import android.view.View; import android.widget.ImageView; @@ -19,6 +24,7 @@ import androidx.annotation.Nullable; import androidx.annotation.RequiresApi; import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.widget.AppCompatButton; +import androidx.core.content.ContextCompat; import com.alibaba.fastjson.JSON; import com.example.stlink.R; @@ -234,11 +240,28 @@ public class CreateSign extends AppCompatActivity { }); //定位 etLocation.setOnClickListener(v -> { - Intent intent = new Intent(CreateSign.this, MapActivity.class); - intent.putExtras(getIntent().getExtras()); - intentActivityResultLauncher.launch(intent); -// etLocation.setText("定位"); + LocationManager lm = (LocationManager) getSystemService(LOCATION_SERVICE); + boolean ok = lm.isProviderEnabled(LocationManager.GPS_PROVIDER); + if (ok) {//开了定位服务 + if (ContextCompat.checkSelfPermission(CreateSign.this, Manifest.permission.ACCESS_FINE_LOCATION) + == PackageManager.PERMISSION_GRANTED) { //有权限 + Intent intent = new Intent(CreateSign.this, MapActivity.class); + intent.putExtras(getIntent().getExtras()); + intentActivityResultLauncher.launch(intent); + } else { // 跳转到授予定位权限界面 + Toast.makeText(CreateSign.this, "需要授予定位权限", Toast.LENGTH_SHORT).show(); + Intent intent = new Intent(); + intent.setAction(android.provider.Settings.ACTION_APPLICATION_DETAILS_SETTINGS); + intent.setData(Uri.parse("package:" + this.getPackageName())); + startActivity(intent); + } + } else { + Toast.makeText(CreateSign.this, "系统检测到未开启GPS定位服务", Toast.LENGTH_SHORT).show(); + Intent intent = new Intent(); + intent.setAction(Settings.ACTION_LOCATION_SOURCE_SETTINGS); + startActivity(intent); + } }); //保存按钮 abBtSave.setOnClickListener(v -> { diff --git a/app/src/main/java/com/example/stlink/activitys/fragmentChild/activityUserInfo/ModifyUserInfo.java b/app/src/main/java/com/example/stlink/activitys/fragmentChild/activityUserInfo/ModifyUserInfo.java index e2bd62e..912044a 100644 --- a/app/src/main/java/com/example/stlink/activitys/fragmentChild/activityUserInfo/ModifyUserInfo.java +++ b/app/src/main/java/com/example/stlink/activitys/fragmentChild/activityUserInfo/ModifyUserInfo.java @@ -276,7 +276,7 @@ public class ModifyUserInfo extends AppCompatActivity { @Override public void run() { JSONObject jsonObject = new JSONObject(); - Boolean isLegalInput = false; + boolean isLegalInput = false; try { jsonObject.put(ModelFieldConstants.ID, (Long) bundle.get(ModelFieldConstants.ID)); } catch (JSONException e) { diff --git a/app/src/main/java/com/example/stlink/activitys/fragmentChild/activityUserInfo/UserInfoDetail.java b/app/src/main/java/com/example/stlink/activitys/fragmentChild/activityUserInfo/UserInfoDetail.java index bf89257..ad79730 100644 --- a/app/src/main/java/com/example/stlink/activitys/fragmentChild/activityUserInfo/UserInfoDetail.java +++ b/app/src/main/java/com/example/stlink/activitys/fragmentChild/activityUserInfo/UserInfoDetail.java @@ -1,11 +1,16 @@ package com.example.stlink.activitys.fragmentChild.activityUserInfo; +import android.Manifest; import android.annotation.SuppressLint; import android.content.Intent; +import android.content.pm.PackageManager; +import android.location.LocationManager; +import android.net.Uri; import android.os.Bundle; import android.os.Handler; import android.os.Looper; import android.os.Message; +import android.provider.Settings; import android.view.View; import android.widget.ImageView; import android.widget.TextView; @@ -17,12 +22,15 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.appcompat.app.AppCompatActivity; import androidx.constraintlayout.widget.ConstraintLayout; +import androidx.core.content.ContextCompat; import com.bumptech.glide.Glide; import com.bumptech.glide.load.resource.bitmap.RoundedCorners; import com.bumptech.glide.request.RequestOptions; import com.donkingliang.imageselector.utils.ImageSelector; import com.example.stlink.R; +import com.example.stlink.activitys.MapActivity; +import com.example.stlink.activitys.fragmentChild.activityTeaHome.CreateSign; import com.example.stlink.model.constants.ModelFieldConstants; import com.example.stlink.model.constants.UrlConstants; import com.example.stlink.utils.CommonUtils; @@ -188,12 +196,10 @@ public class UserInfoDetail extends AppCompatActivity { if(idNumberMsg != null){ tvIdNumberMsg.setText(String.valueOf(idNumberMsg)); } - if(sexMsg != null){ - if(sexMsg){ - tvSexMsg.setText("男"); - }else{ - tvSexMsg.setText("女"); - } + if(sexMsg){ + tvSexMsg.setText("男"); + }else{ + tvSexMsg.setText("女"); } if(createTimeMsg != null){ Date date = new Date(createTimeMsg); @@ -210,7 +216,6 @@ public class UserInfoDetail extends AppCompatActivity { } - /** * 初始化按钮事件 */