diff --git a/gradle.properties b/gradle.properties index 4840e6faa..c9e9fb45c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -26,5 +26,5 @@ android.enableJetifier=true android.useAndroidX=true android.useDeprecatedNdk=true -versionCode=100 -versionName=4.12.0 \ No newline at end of file +versionCode=101 +versionName=4.12.01 \ No newline at end of file diff --git a/iFish7/build.gradle b/iFish7/build.gradle index 5d0b588c4..5e49b9e0d 100644 --- a/iFish7/build.gradle +++ b/iFish7/build.gradle @@ -82,10 +82,12 @@ android { debug { minifyEnabled false signingConfig signingConfigs.config + buildConfigField('boolean', 'show', 'false') } release { minifyEnabled false signingConfig signingConfigs.config + buildConfigField('boolean', 'show', 'false') } } dexOptions { diff --git a/iFish7/src/main/java/com/ifish/activity/MineActivity.java b/iFish7/src/main/java/com/ifish/activity/MineActivity.java index d933e2244..48f6e1af3 100644 --- a/iFish7/src/main/java/com/ifish/activity/MineActivity.java +++ b/iFish7/src/main/java/com/ifish/activity/MineActivity.java @@ -13,6 +13,7 @@ import android.app.Fragment; import android.content.Context; import android.content.DialogInterface; import android.content.Intent; +import android.content.pm.PackageManager; import android.graphics.Bitmap; import android.net.Uri; import android.os.Build; @@ -32,6 +33,7 @@ import android.widget.RelativeLayout; import android.widget.TextView; import androidx.annotation.NonNull; +import androidx.core.content.ContextCompat; import com.bumptech.glide.Glide; import com.ifish.basebean.BaseBean; @@ -280,7 +282,12 @@ public class MineActivity extends BaseActivity { private void changeHead() { - showPermissionHint(); + if (ContextCompat.checkSelfPermission(this, android.Manifest.permission.ACCESS_FINE_LOCATION) + != PackageManager.PERMISSION_GRANTED || BuildConfig.show) { + showPermissionHint(); + }else { + gallery(); + } } private void changeSex() { diff --git a/iFish7/src/main/java/com/ifish/fragment/DeviceFragment.java b/iFish7/src/main/java/com/ifish/fragment/DeviceFragment.java index 96e394149..1e825c4c7 100644 --- a/iFish7/src/main/java/com/ifish/fragment/DeviceFragment.java +++ b/iFish7/src/main/java/com/ifish/fragment/DeviceFragment.java @@ -22,6 +22,7 @@ import android.content.Context; import android.content.DialogInterface; import android.content.Intent; import android.content.SharedPreferences; +import android.content.pm.PackageManager; import android.graphics.Color; import android.net.Uri; import android.os.Build; @@ -50,6 +51,7 @@ import android.widget.TextView; import androidx.annotation.NonNull; import androidx.core.app.ActivityCompat; +import androidx.core.content.ContextCompat; import com.bumptech.glide.Glide; //jjia-push @@ -58,6 +60,7 @@ import com.bumptech.glide.Glide; //import com.clj.fastble.data.BleDevice; //import com.clj.fastble.data.BleScanState; import com.ifish.activity.BindTwoDeviceActivity; +import com.ifish.activity.BuildConfig; import com.ifish.activity.DeviceInstructionActivity; import com.ifish.activity.InformationListActivity; import com.ifish.activity.MineActivity; @@ -666,16 +669,25 @@ public class DeviceFragment extends BaseV4Fragment implements ObservableScrollVi } }; + private int getVersionValue(String value){ + String valueStr = value.replace("V","").replace("v","").replace(".",""); + return Integer.parseInt(TextUtils.isEmpty(valueStr)?"0":valueStr); + } private void checkVersion() { versionCode = versionCode.toUpperCase(); - L.i("jjiaa------版本号"+versionCode); spversionCode = sp.getString("versionCode",""); - L.i("jjiaa------版本号sp="+versionCode); - if (!HttpManager.getVersionName(getActivity()).equals(versionCode) && !spversionCode.equals(versionCode)) { + + int versionCodeValue = getVersionValue(versionCode); +// int spversionCodeValue = getVersionValue(spversionCode); + int appCodeValue = getVersionValue(HttpManager.getVersionName(requireActivity())); + L.i("jjia-------1-"+versionCodeValue); + L.i("jjia-------3-"+appCodeValue); +// if (!HttpManager.getVersionName(requireActivity()).equals(versionCode) && !spversionCode.equals(versionCode)) { + if (versionCodeValue > appCodeValue && !spversionCode.equals(versionCode)) { if (!MustUpdate.equals(isMustUpdate)) { sp.putString("versionCode",versionCode); } - final AlertDialog.Builder dialog = new AlertDialog.Builder(getActivity()); + final AlertDialog.Builder dialog = new AlertDialog.Builder(requireActivity()); dialog.setTitle("发现新版本,是否升级?"); dialog.setCancelable(false); //返回键不能取消对话框 强制更新 //json数据:"uploadContent": "1、可以看商家啦\\n2、有社交啦\\n3、瞬间爆炸" @@ -1595,7 +1607,9 @@ public class DeviceFragment extends BaseV4Fragment implements ObservableScrollVi // jiablue // EventBean eventBean = new EventBean(EventBean.BLUETOOTH_STOP_SCAN); // EventBus.getDefault().post(eventBean); - showPermissionHint(); + + + addDevice(); break; @@ -1610,9 +1624,7 @@ public class DeviceFragment extends BaseV4Fragment implements ObservableScrollVi AnimationUtil.startAnimation(getActivity()); break; case R.id.title_img_right: - intent.setClass(getActivity(), BindTwoDeviceActivity.class); - startActivity(intent); - AnimationUtil.startAnimation(getActivity()); + addDevice(); break; case R.id.title_img_right_two: intent.setClass(getActivity(), RecentContactsActivity.class); @@ -1623,11 +1635,22 @@ public class DeviceFragment extends BaseV4Fragment implements ObservableScrollVi } } + private void addDevice(){ + if (ContextCompat.checkSelfPermission(requireActivity(), android.Manifest.permission.ACCESS_FINE_LOCATION) + != PackageManager.PERMISSION_GRANTED || BuildConfig.show) { + showPermissionHint(); + }else { + Intent intentx = new Intent(); + intentx.setClass(requireActivity(), BindTwoDeviceActivity.class); + startActivity(intentx); + AnimationUtil.startAnimation(requireActivity()); + } + } private void buyCamera() { Intent i = new Intent(getActivity(), WebViewTaobaoActivity.class); i.putExtra(WebViewTaobaoActivity.URL, HttpManager.BuyCameraTaobao_URL); startActivity(i); - AnimationUtil.startAnimation(getActivity()); + AnimationUtil.startAnimation(requireActivity()); } public void onEventMainThread(Information event) {