diff --git a/iFish7/src/main/AndroidManifest.xml b/iFish7/src/main/AndroidManifest.xml index 44abb2324..445826cc2 100644 --- a/iFish7/src/main/AndroidManifest.xml +++ b/iFish7/src/main/AndroidManifest.xml @@ -19,6 +19,7 @@ + diff --git a/iFish7/src/main/java/com/ifish/activity/LoginActivity.java b/iFish7/src/main/java/com/ifish/activity/LoginActivity.java index 79abb4104..436cf2dd5 100644 --- a/iFish7/src/main/java/com/ifish/activity/LoginActivity.java +++ b/iFish7/src/main/java/com/ifish/activity/LoginActivity.java @@ -78,6 +78,7 @@ public class LoginActivity extends BaseActivity { initTitleView(); initView(); initListener(); + SPUtil.getInstance(this).putBoolean("xfirst",false); } private void initView() { @@ -294,7 +295,7 @@ public class LoginActivity extends BaseActivity { switch (msg.what) { case NetWork.Success: saveInfo(); - ToastUtil.show(getApplicationContext(), "登录成功"); +// ToastUtil.show(getApplicationContext(), "登录成功"); dismissProgressDialog(); startActivity(MainTabActivity.class); finish(); diff --git a/iFish7/src/main/java/com/ifish/activity/NoNetwork.java b/iFish7/src/main/java/com/ifish/activity/NoNetwork.java index e6fae2b62..6be650dc7 100644 --- a/iFish7/src/main/java/com/ifish/activity/NoNetwork.java +++ b/iFish7/src/main/java/com/ifish/activity/NoNetwork.java @@ -226,7 +226,7 @@ public class NoNetwork extends BaseSingleActivity { Intent intent = new Intent(); switch (msg.what) { case NetWork.Success: - ToastUtil.show(getApplicationContext(), "登录成功"); +// ToastUtil.show(getApplicationContext(), "登录成功"); String stringExtra = getIntent().getStringExtra("jpush"); if (!TextUtils.isEmpty(stringExtra)) { intent.putExtra("jpush", stringExtra); diff --git a/iFish7/src/main/java/com/ifish/activity/RegisteredActivity.java b/iFish7/src/main/java/com/ifish/activity/RegisteredActivity.java index 907f7dad8..3866b3df9 100644 --- a/iFish7/src/main/java/com/ifish/activity/RegisteredActivity.java +++ b/iFish7/src/main/java/com/ifish/activity/RegisteredActivity.java @@ -93,6 +93,7 @@ public class RegisteredActivity extends BaseActivityNotAnim { initView(); init(); initListener(); + SPUtil.getInstance(this).putBoolean("xfirst",false); } private void test() { diff --git a/iFish7/src/main/java/com/ifish/fragment/DeviceFragment.java b/iFish7/src/main/java/com/ifish/fragment/DeviceFragment.java index 449b9c4c3..3f03e68b0 100644 --- a/iFish7/src/main/java/com/ifish/fragment/DeviceFragment.java +++ b/iFish7/src/main/java/com/ifish/fragment/DeviceFragment.java @@ -198,6 +198,8 @@ public class DeviceFragment extends BaseV4Fragment implements ObservableScrollVi public static Activity cam_ctx; private PermissionHelper permissionHelper; + private String permissionHintFirst = ""; + private String permissionHint = ""; // String[] permission; String[] permission_blue; @Override @@ -226,10 +228,18 @@ public class DeviceFragment extends BaseV4Fragment implements ObservableScrollVi permissionHelper = new PermissionHelper(DeviceFragment.this, permission_blue, 250); initBooth(); - boolean notificationsEnabled = PushManager.getInstance().areNotificationsEnabled(requireActivity()); - if (!notificationsEnabled){ - toOpenNotifications(); + + if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU){ + boolean notificationsEnabled = PushManager.getInstance().areNotificationsEnabled(requireActivity()); + if (!notificationsEnabled){ + toOpenNotifications(); + } + permissionHintFirst = ""; + permissionHint = ""; + }else { + } + return v; } @@ -1938,10 +1948,10 @@ public class DeviceFragment extends BaseV4Fragment implements ObservableScrollVi L.i("jjjia-----------蓝牙不可用---"); } }else { - boolean first = SPUtil.getInstance(requireContext()).getBoolean("firstx",false); + boolean first = SPUtil.getInstance(requireContext()).getBoolean("xfirst",false); if (!first){ showPermissionHint(false); - SPUtil.getInstance(requireContext()).putBoolean("firstx",false); + SPUtil.getInstance(requireContext()).putBoolean("xfirst",true); } L.i("jjjia-----------没有扫描权限---"); } @@ -1962,9 +1972,9 @@ public class DeviceFragment extends BaseV4Fragment implements ObservableScrollVi IosAlertDialog openDialog = new IosAlertDialog(requireContext()).builder(); openDialog.setCancelable(true); - openDialog.setTitle("申请权限目的说明"); - openDialog.setMessage(jump?"APP首次绑定设备需要访问位置权限和蓝牙使用权限，在稍后弹出的权限使用对话框中请点击确定，并打开手机蓝牙。":"添加设备，需要先获取位置信息，才能获取附近wifi信息或智能设备，进行配网连接您的设备，是否允许申请位置权限和蓝牙权限？"); - openDialog.setPositiveButton("继续", new View.OnClickListener() { + openDialog.setTitle("重要提示"); + openDialog.setMessage(!jump?"APP首次绑定设备需要访问位置权限和蓝牙使用权限，在稍后弹出的权限使用对话框中请点击确定，并打开手机蓝牙。":"添加设备，需要先获取位置信息，才能获取附近wifi信息或智能设备，进行配网连接您的设备，是否允许申请位置权限和蓝牙权限？"); + openDialog.setPositiveButton("确定", new View.OnClickListener() { @Override public void onClick(View view) { getPermission(jump); diff --git a/iFish7/src/main/java/com/ifish/utils/AppUtil.java b/iFish7/src/main/java/com/ifish/utils/AppUtil.java index 9bb8379e4..de4d16605 100644 --- a/iFish7/src/main/java/com/ifish/utils/AppUtil.java +++ b/iFish7/src/main/java/com/ifish/utils/AppUtil.java @@ -14,6 +14,7 @@ import android.util.Log; import android.widget.ImageView; import androidx.activity.ComponentActivity; +import androidx.annotation.RequiresApi; import androidx.appcompat.app.AppCompatActivity; import androidx.core.content.ContextCompat; @@ -297,11 +298,16 @@ public class AppUtil { perList.add(android.Manifest.permission.BLUETOOTH); perList.add(android.Manifest.permission.ACCESS_FINE_LOCATION); perList.add(android.Manifest.permission.ACCESS_COARSE_LOCATION); + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S){ perList.add(android.Manifest.permission.BLUETOOTH_SCAN); perList.add(android.Manifest.permission.BLUETOOTH_ADVERTISE); perList.add(android.Manifest.permission.BLUETOOTH_CONNECT); } + + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU){ + perList.add(android.Manifest.permission.POST_NOTIFICATIONS); + } int size = perList.size(); String [] permissions = new String[size]; diff --git a/iFish7/src/main/java/com/ifish/view/IosAlertDialog.java b/iFish7/src/main/java/com/ifish/view/IosAlertDialog.java index 62b1b5d08..55fe5a20d 100644 --- a/iFish7/src/main/java/com/ifish/view/IosAlertDialog.java +++ b/iFish7/src/main/java/com/ifish/view/IosAlertDialog.java @@ -113,6 +113,10 @@ public class IosAlertDialog { } + public void setTextStart(){ + txt_msg.setTextAlignment(View.TEXT_ALIGNMENT_TEXT_START); + } + public IosAlertDialog setMessage(String msg) { showMsg = true; if(!isMiddleShowEclipse){