diff --git a/gradle.properties b/gradle.properties index 280e8c674..b151752a8 100644 --- a/gradle.properties +++ b/gradle.properties @@ -26,5 +26,10 @@ android.enableJetifier=true android.useAndroidX=true android.useDeprecatedNdk=true +<<<<<<< HEAD versionCode=57 -versionName=4.11.11 \ No newline at end of file +versionName=4.11.11 +======= +versionCode=101 +versionName=4.12.01 +>>>>>>> release-20250211 diff --git a/iFish7/build.gradle b/iFish7/build.gradle index 2bc904553..ee9e6e7bc 100644 --- a/iFish7/build.gradle +++ b/iFish7/build.gradle @@ -43,7 +43,7 @@ android { versionName project.versionName multiDexEnabled true ndk { - abiFilters 'armeabi', 'arm64-v8a' + abiFilters "arm64-v8a" } manifestPlaceholders = [ @@ -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/HotSpotConnentDeviceActivity.java b/iFish7/src/main/java/com/ifish/activity/HotSpotConnentDeviceActivity.java index 9512f7baa..5caf1c700 100644 --- a/iFish7/src/main/java/com/ifish/activity/HotSpotConnentDeviceActivity.java +++ b/iFish7/src/main/java/com/ifish/activity/HotSpotConnentDeviceActivity.java @@ -240,86 +240,8 @@ public class HotSpotConnentDeviceActivity extends BaseActivity { int devicePosition = 0; public void toDevice() { - Intent i = new Intent(); -// try { -// Integer controlAmount = Commons.DEVICE.get(devicePosition).getControlAmount(); -// Integer timerAmount = Commons.DEVICE.get(devicePosition).getTimerAmount(); -// String type = Commons.DEVICE.get(devicePosition).type; -// if (Commons.FishKey.On.equals(Commons.DEVICE.get(devicePosition).isBlacklist)) {//黑名单 -// i.setClass(HotSpotConnentDeviceActivity.this, BlackListActivity.class); -// } else { -// if (Device.TYPE_1C.equals(type)) { -// i.setClass(HotSpotConnentDeviceActivity.this, MainThree1CControlActivity.class); -// } else if (Device.TYPE_AA.equals(type)) { -// i.setClass(HotSpotConnentDeviceActivity.this, MainFiveControlActivity.class); -// } else if (Device.TYPE_BD.equals(type)) { -// i.setClass(HotSpotConnentDeviceActivity.this, MainFiveBDControlActivity.class); -// } else if (Device.TYPE_2A.equals(type)) { -// i.setClass(HotSpotConnentDeviceActivity.this, MainSix_2A_ControlActivity.class); -// } else if (Device.TYPE_2B.equals(type)) { -// i.setClass(HotSpotConnentDeviceActivity.this, MainFour_2B_ControlActivity.class); -// } else if (Device.TYPE_3A.equals(type)) { -// i.setClass(HotSpotConnentDeviceActivity.this, MainHot_3A_ControlActivity.class); -// } else if (Device.TYPE_2F.equals(type)) { -// i.setClass(HotSpotConnentDeviceActivity.this, MainSeven_2F_ControlActivity.class); -// } else if (Device.TYPE_3F.equals(type)) { -// i.setClass(HotSpotConnentDeviceActivity.this, MainFour_3F_ControlActivity.class); -// } else if (Device.TYPE_4F.equals(type) || Device.TYPE_5F.equals(type)){ -// i.setClass(HotSpotConnentDeviceActivity.this, MainSix_4F_ControlActivity.class); -// } else { -// if (controlAmount == null) {//如果控制器返回空 则默认给三控的页面 -// i.setClass(HotSpotConnentDeviceActivity.this, MainThreeControlActivity.class); -// } else { -// i.setClass(HotSpotConnentDeviceActivity.this, MainThreeControlActivity.class); -// switch (controlAmount) { -// case 0: { -// i.setClass(HotSpotConnentDeviceActivity.this, MainZeroControlActivity.class); -// break; -// } -// case 2: { -// i.setClass(HotSpotConnentDeviceActivity.this, MainTwoControlActivity.class); -// break; -// } -// case 3: { -// i.setClass(HotSpotConnentDeviceActivity.this, MainThreeControlActivity.class); -// break; -// } -// case 4: { -// if (timerAmount == 6) { // 可丽爱 -// i.setClass(HotSpotConnentDeviceActivity.this, MainFiveControlActivity.class); -// } else {//4控 -// i.setClass(HotSpotConnentDeviceActivity.this, MainFourControlActivity.class); -// } -// break; -// } -// case 5: { -// if (6 == timerAmount) {//5控六定时器 询多页面 -// i.setClass(HotSpotConnentDeviceActivity.this, MainSixControlActivity.class); -// } -// break; -// } -// case 8: { -// i.setClass(HotSpotConnentDeviceActivity.this, MainEightControlActivity.class); -// break; -// } -// default: { -// i.setClass(HotSpotConnentDeviceActivity.this, MainThreeControlActivity.class); -// break; -// } -// } -// } -// } -// } -// } catch (Exception e) { -// i.setClass(HotSpotConnentDeviceActivity.this, MainThreeControlActivity.class); -// } -// i.putExtra("mac",device_mac); -// i.putExtra("title",title); - i.putExtra(BaseGradeActivity.BINDDEVICE, true);//绑定成功增加经验 - AppRoute.newToStart(HotSpotConnentDeviceActivity.this,i,deviceObj); + AppRoute.newToStart(HotSpotConnentDeviceActivity.this,deviceObj,true); ToastUtil.show(HotSpotConnentDeviceActivity.this, "绑定设备成功"); - AnimationUtil.startAnimation(HotSpotConnentDeviceActivity.this); - EventBean eventBean =new EventBean(EventBean.LINK_FINISH,0); EventBus.getDefault().post(eventBean); finish(); @@ -494,87 +416,7 @@ public class HotSpotConnentDeviceActivity extends BaseActivity { Commons.HAVE_DEVICE = true;//改变判断是否绑定的变量 Commons.IS_CAMERA = false; sp.putBoolean(LoginSPKey.IS_CAMERA, Commons.IS_CAMERA); - Intent i = new Intent(); -// try { -// Integer controlAmount = Commons.DEVICE.get(Commons.DevicePosition).getControlAmount(); -// Integer timerAmount = Commons.DEVICE.get(Commons.DevicePosition).getTimerAmount(); -// String type = Commons.DEVICE.get(Commons.DevicePosition).type; -// if (Commons.FishKey.On.equals(Commons.DEVICE.get(Commons.DevicePosition).isBlacklist)) {//黑名单 -// i.setClass(HotSpotConnentDeviceActivity.this, BlackListActivity.class); -// } else { -// if (Device.TYPE_1C.equals(type)) { -// i.setClass(HotSpotConnentDeviceActivity.this, MainThree1CControlActivity.class); -// } else if (Device.TYPE_AA.equals(type)) { -// i.setClass(HotSpotConnentDeviceActivity.this, MainFiveControlActivity.class); -// } else if (Device.TYPE_BD.equals(type)) { -// i.setClass(HotSpotConnentDeviceActivity.this, MainFiveBDControlActivity.class); -// } else if (Device.TYPE_2A.equals(type)) { -// i.setClass(HotSpotConnentDeviceActivity.this, MainSix_2A_ControlActivity.class); -// } else if (Device.TYPE_2B.equals(type)) { -// i.setClass(HotSpotConnentDeviceActivity.this, MainFour_2B_ControlActivity.class); -// } else if (Device.TYPE_3A.equals(type)) { -// i.setClass(HotSpotConnentDeviceActivity.this, MainHot_3A_ControlActivity.class); -// } else if (Device.TYPE_2F.equals(type)) { -// i.setClass(HotSpotConnentDeviceActivity.this, MainSeven_2F_ControlActivity.class); -// } else if (Device.TYPE_3F.equals(type)) { -// i.setClass(HotSpotConnentDeviceActivity.this, MainFour_3F_ControlActivity.class); -// } else if (Device.TYPE_4F.equals(type) || Device.TYPE_5F.equals(type)){ -// i.setClass(HotSpotConnentDeviceActivity.this, MainSix_4F_ControlActivity.class); -// } else { -// if (controlAmount == null) {//如果控制器返回空 则默认给三控的页面 -// i.setClass(HotSpotConnentDeviceActivity.this, MainThreeControlActivity.class); -// } else { -// i.setClass(HotSpotConnentDeviceActivity.this, MainThreeControlActivity.class); -// switch (controlAmount) { -// case 0: { -// i.setClass(HotSpotConnentDeviceActivity.this, MainZeroControlActivity.class); -// break; -// } -// case 2: { -// i.setClass(HotSpotConnentDeviceActivity.this, MainTwoControlActivity.class); -// break; -// } -// case 3: { -// i.setClass(HotSpotConnentDeviceActivity.this, MainThreeControlActivity.class); -// break; -// } -// case 4: { -// if (timerAmount == 6) { // 可丽爱 -// i.setClass(HotSpotConnentDeviceActivity.this, MainFiveControlActivity.class); -// } else {//4控 -// i.setClass(HotSpotConnentDeviceActivity.this, MainFourControlActivity.class); -// } -// break; -// } -// case 5: { -// if (6 == timerAmount) {//5控六定时器 询多页面 -// i.setClass(HotSpotConnentDeviceActivity.this, MainSixControlActivity.class); -// } -// break; -// } -// case 8: { -// i.setClass(HotSpotConnentDeviceActivity.this, MainEightControlActivity.class); -// break; -// } -// default: { -// i.setClass(HotSpotConnentDeviceActivity.this, MainThreeControlActivity.class); -// break; -// } -// } -// } -// } -// -// -// } -// } catch (Exception e) { -// i.setClass(HotSpotConnentDeviceActivity.this, MainThreeControlActivity.class); -// } - -// i.putExtra("title",title); -// i.putExtra("mac",device_mac); - i.putExtra(BaseGradeActivity.BINDDEVICE, true);//绑定成功增加经验 - - AppRoute.newToStart(HotSpotConnentDeviceActivity.this,i,deviceObj); + AppRoute.newToStart(HotSpotConnentDeviceActivity.this,deviceObj,true); ToastUtil.show(HotSpotConnentDeviceActivity.this, "绑定设备成功"); EventBean eventBean =new EventBean(EventBean.LINK_FINISH,0); EventBus.getDefault().post(eventBean); @@ -619,86 +461,7 @@ public class HotSpotConnentDeviceActivity extends BaseActivity { Commons.HAVE_DEVICE = true;//改变判断是否绑定的变量 Commons.IS_CAMERA = false; sp.putBoolean(LoginSPKey.IS_CAMERA, Commons.IS_CAMERA); - Intent i = new Intent(); -// i.putExtra("mac",device_mac); -// try { -// Integer controlAmount = Commons.DEVICE.get(Commons.DevicePosition).getControlAmount(); -// Integer timerAmount = Commons.DEVICE.get(Commons.DevicePosition).getTimerAmount(); -// String type = Commons.DEVICE.get(Commons.DevicePosition).type; -// if (Commons.FishKey.On.equals(Commons.DEVICE.get(Commons.DevicePosition).isBlacklist)) {//黑名单 -// i.setClass(HotSpotConnentDeviceActivity.this, BlackListActivity.class); -// } else { -// if (Device.TYPE_1C.equals(type)) { -// i.setClass(HotSpotConnentDeviceActivity.this, MainThree1CControlActivity.class); -// } else if (Device.TYPE_AA.equals(type)) { -// i.setClass(HotSpotConnentDeviceActivity.this, MainFiveControlActivity.class); -// } else if (Device.TYPE_BD.equals(type)) { -// i.setClass(HotSpotConnentDeviceActivity.this, MainFiveBDControlActivity.class); -// } else if (Device.TYPE_2A.equals(type)) { -// i.setClass(HotSpotConnentDeviceActivity.this, MainSix_2A_ControlActivity.class); -// } else if (Device.TYPE_2B.equals(type)) { -// i.setClass(HotSpotConnentDeviceActivity.this, MainFour_2B_ControlActivity.class); -// } else if (Device.TYPE_3A.equals(type)) { -// i.setClass(HotSpotConnentDeviceActivity.this, MainHot_3A_ControlActivity.class); -// } else if (Device.TYPE_2F.equals(type)) { -// i.setClass(HotSpotConnentDeviceActivity.this, MainSeven_2F_ControlActivity.class); -// } else if (Device.TYPE_3F.equals(type)) { -// i.setClass(HotSpotConnentDeviceActivity.this, MainFour_3F_ControlActivity.class); -// } else if (Device.TYPE_4F.equals(type) || Device.TYPE_5F.equals(type)){ -// i.setClass(HotSpotConnentDeviceActivity.this, MainSix_4F_ControlActivity.class); -// } else { -// if (controlAmount == null) {//如果控制器返回空 则默认给三控的页面 -// i.setClass(HotSpotConnentDeviceActivity.this, MainThreeControlActivity.class); -// } else { -// i.setClass(HotSpotConnentDeviceActivity.this, MainThreeControlActivity.class); -// switch (controlAmount) { -// case 0: { -// i.setClass(HotSpotConnentDeviceActivity.this, MainZeroControlActivity.class); -// break; -// } -// case 2: { -// i.setClass(HotSpotConnentDeviceActivity.this, MainTwoControlActivity.class); -// break; -// } -// case 3: { -// i.setClass(HotSpotConnentDeviceActivity.this, MainThreeControlActivity.class); -// break; -// } -// case 4: { -// if (timerAmount == 6) { // 可丽爱 -// i.setClass(HotSpotConnentDeviceActivity.this, MainFiveControlActivity.class); -// } else {//4控 -// i.setClass(HotSpotConnentDeviceActivity.this, MainFourControlActivity.class); -// } -// break; -// } -// case 5: { -// if (6 == timerAmount) {//5控六定时器 询多页面 -// i.setClass(HotSpotConnentDeviceActivity.this, MainSixControlActivity.class); -// } -// break; -// } -// case 8: { -// i.setClass(HotSpotConnentDeviceActivity.this, MainEightControlActivity.class); -// break; -// } -// default: { -// i.setClass(HotSpotConnentDeviceActivity.this, MainThreeControlActivity.class); -// break; -// } -// } -// } -// } -// -// -// } -// } catch (Exception e) { -// i.setClass(HotSpotConnentDeviceActivity.this, MainThreeControlActivity.class); -// } -// i.putExtra("title",title); -// i.putExtra("mac",device_mac); - i.putExtra(BaseGradeActivity.BINDDEVICE, true);//绑定成功增加经验 - AppRoute.newToStart(HotSpotConnentDeviceActivity.this,i,deviceObj); + AppRoute.newToStart(HotSpotConnentDeviceActivity.this,deviceObj,true); ToastUtil.show(HotSpotConnentDeviceActivity.this, "绑定设备成功"); EventBean eventBean =new EventBean(EventBean.LINK_FINISH,0); EventBus.getDefault().post(eventBean); diff --git a/iFish7/src/main/java/com/ifish/activity/MineActivity.java b/iFish7/src/main/java/com/ifish/activity/MineActivity.java index ecf065456..f94715d3f 100644 --- a/iFish7/src/main/java/com/ifish/activity/MineActivity.java +++ b/iFish7/src/main/java/com/ifish/activity/MineActivity.java @@ -7,12 +7,9 @@ */ package com.ifish.activity; -import android.app.AlertDialog; import android.app.Dialog; -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; @@ -24,7 +21,6 @@ import android.provider.MediaStore; import android.provider.Settings; import android.text.TextUtils; import android.view.View; -import android.view.View.OnClickListener; import android.view.Window; import android.widget.EditText; import android.widget.ImageView; @@ -32,6 +28,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; @@ -40,14 +37,12 @@ import com.ifish.basebean.LoadHeadImage; import com.ifish.basebean.User; import com.ifish.baseclass.BaseActivity; import com.ifish.baseclass.UriForFile; -import com.ifish.fragment.DeviceFragment; import com.ifish.permission.PermissionHelper; import com.ifish.utils.AnimationUtil; import com.ifish.utils.AppUtil; import com.ifish.utils.Commons; import com.ifish.utils.Commons.NetWork; import com.ifish.utils.Commons.Text; -import com.ifish.utils.GlideEngine; import com.ifish.utils.HttpListener; import com.ifish.utils.HttpManager; import com.ifish.utils.L; @@ -55,21 +50,11 @@ import com.ifish.utils.SPUtil; import com.ifish.utils.ToastUtil; import com.ifish.view.CircleImageView; import com.ifish.view.IosAlertDialog; -import com.ifish.view.SelectorImageView; import com.ifish.view.picture.PictureSelectBean; import com.ifish.view.picture.PictureSelectorUtil; import com.luck.picture.lib.basic.PictureSelector; import com.luck.picture.lib.config.PictureConfig; -import com.luck.picture.lib.config.SelectMimeType; -import com.luck.picture.lib.config.SelectModeConfig; -import com.luck.picture.lib.engine.CropEngine; -import com.luck.picture.lib.engine.CropFileEngine; import com.luck.picture.lib.entity.LocalMedia; -import com.luck.picture.lib.interfaces.OnResultCallbackListener; -import com.squareup.picasso.Picasso; -import com.yalantis.ucrop.UCrop; -import com.yalantis.ucrop.UCropImageEngine; - import java.io.BufferedOutputStream; import java.io.File; import java.io.FileOutputStream; @@ -291,7 +276,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() { @@ -700,17 +690,19 @@ public class MineActivity extends BaseActivity { super.onRequestPermissionsResult(requestCode, permissions, grantResults); if (permissionHelper != null) { permissionHelper.onRequestPermissionsResult(requestCode, permissions, grantResults); + if (openDialog!=null && permissionHelper.checkSelfPermission(permission)){ + openDialog.dismiss(); + } } } + IosAlertDialog openDialog; private void showPermissionHint(){ - - - IosAlertDialog openDialog = new IosAlertDialog(MineActivity.this).builder(); + openDialog = new IosAlertDialog(MineActivity.this).builder(); openDialog.setCancelable(true); openDialog.setTitle("申请权限目的说明"); openDialog.setMessage("设置头像，需要从手机相册中选择图片或使用手机相机拍照进行上传设置，访问相册和相机拍照app需要申请相机和相册存储权限，是否允许申请？"); - openDialog.setPositiveButton("继续", new View.OnClickListener() { + openDialog.setPositiveButtonx("继续", new View.OnClickListener() { @Override public void onClick(View view) { if (permissionHelper.checkSelfPermission(permission)) { @@ -720,10 +712,11 @@ public class MineActivity extends BaseActivity { } } }); + + openDialog.setNegativeButton("取消", new View.OnClickListener() { @Override public void onClick(View view) { - } }); openDialog.show(); diff --git a/iFish7/src/main/java/com/ifish/activity/newbind/AirKissUtil.java b/iFish7/src/main/java/com/ifish/activity/newbind/AirKissUtil.java index 57681fc1e..ad45caa57 100644 --- a/iFish7/src/main/java/com/ifish/activity/newbind/AirKissUtil.java +++ b/iFish7/src/main/java/com/ifish/activity/newbind/AirKissUtil.java @@ -532,15 +532,8 @@ public class AirKissUtil { Commons.HAVE_DEVICE = true;//改变判断是否绑定的变量 Commons.IS_CAMERA = false; sp.putBoolean(Commons.LoginSPKey.IS_CAMERA, Commons.IS_CAMERA); - Intent i = new Intent(); - -// i.putExtra("mac",device_mac); -// i.putExtra("title",title); - i.putExtra(BaseGradeActivity.BINDDEVICE, true);//绑定成功增加经验 ToastUtil.show(curActivity, "绑定设备成功"); - AppRoute.newToStart(curActivity,i,deviceObj); - - AnimationUtil.startAnimation(curActivity); + AppRoute.newToStart(curActivity,deviceObj,true); curActivity.finish(); L.i("===================绑定设备成功=" + device_mac); break; @@ -607,9 +600,7 @@ public class AirKissUtil { Commons.IS_CAMERA = false; sp.putBoolean(Commons.LoginSPKey.IS_CAMERA, Commons.IS_CAMERA); ToastUtil.show(curActivity, "绑定设备成功"); - Intent i = new Intent(); - i.putExtra(BaseGradeActivity.BINDDEVICE, true);//绑定成功增加经验 - AppRoute.newToStart(curActivity,i,deviceObj); + AppRoute.newToStart(curActivity,deviceObj,true); curActivity.finish(); L.i("===================绑定设备成功=" + device_mac); diff --git a/iFish7/src/main/java/com/ifish/activity/newbind/NewBindDeviceActivity.java b/iFish7/src/main/java/com/ifish/activity/newbind/NewBindDeviceActivity.java index 4124ac176..40dd6e8ae 100644 --- a/iFish7/src/main/java/com/ifish/activity/newbind/NewBindDeviceActivity.java +++ b/iFish7/src/main/java/com/ifish/activity/newbind/NewBindDeviceActivity.java @@ -1143,16 +1143,9 @@ public class NewBindDeviceActivity extends AppCompatActivity { }; private void toIntent(Device device){ - Intent i = new Intent(); - dismissDialog(); - -// i.putExtra("mac",device_mac); -// i.putExtra("title",title); - i.putExtra(BaseGradeActivity.BINDDEVICE, true);//绑定成功增加经验 ToastUtil.show(NewBindDeviceActivity.this, "绑定设备成功"); - AppRoute.newToStart(NewBindDeviceActivity.this,i,deviceObj); - AnimationUtil.startAnimation(NewBindDeviceActivity.this); + AppRoute.newToStart(NewBindDeviceActivity.this,device,true); EventBus.getDefault().post(new ConnectMessageEvent(1, "test")); finish(); L.i("===================绑定设备成功=" + device_mac); @@ -1203,11 +1196,8 @@ public class NewBindDeviceActivity extends AppCompatActivity { Commons.HAVE_DEVICE = true;//改变判断是否绑定的变量 Commons.IS_CAMERA = false; sp.putBoolean(Commons.LoginSPKey.IS_CAMERA, Commons.IS_CAMERA); - Intent i = new Intent(); - i.putExtra(BaseGradeActivity.BINDDEVICE, true);//绑定成功增加经验 ToastUtil.show(NewBindDeviceActivity.this, "绑定设备成功"); - AppRoute.newToStart(NewBindDeviceActivity.this,i,deviceObj); - AnimationUtil.startAnimation(NewBindDeviceActivity.this); + AppRoute.newToStart(NewBindDeviceActivity.this,deviceObj,true); finish(); L.i("===================绑定设备成功=" + device_mac); break; diff --git a/iFish7/src/main/java/com/ifish/fragment/DeviceFragment.java b/iFish7/src/main/java/com/ifish/fragment/DeviceFragment.java index 958404a19..aea3e3557 100644 --- a/iFish7/src/main/java/com/ifish/fragment/DeviceFragment.java +++ b/iFish7/src/main/java/com/ifish/fragment/DeviceFragment.java @@ -61,6 +61,7 @@ import com.clj.fastble.callback.BleScanCallback; 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; @@ -669,16 +670,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、瞬间爆炸" @@ -1183,7 +1193,7 @@ public class DeviceFragment extends BaseV4Fragment implements ObservableScrollVi lv_camera.setAdapter(cameraAdapter); return; } - Intent intent = new Intent(); +// Intent intent = new Intent(); int index = 0; for (int i1 = 0; i1 < Commons.DEVICE.size(); i1++) { if (showDevice.get(position).getDeviceId().equals(Commons.DEVICE.get(i1).getDeviceId())) { @@ -1195,11 +1205,7 @@ public class DeviceFragment extends BaseV4Fragment implements ObservableScrollVi sp.putInt(LoginSPKey.Position, index); sp.putBoolean(LoginSPKey.IS_CAMERA, Commons.IS_CAMERA); Device clickItem = (Device) lv_device.getItemAtPosition(position); - if (clickItem!=null){ - AppRoute.newToStart(requireActivity(),intent,clickItem); - }else { - AppRoute.oldToStart(requireActivity(),intent); - } + AppRoute.newToStart(requireActivity(),clickItem,false); // try { // Integer controlAmount = Commons.DEVICE.get(Commons.DevicePosition).getControlAmount(); // Integer timerAmount = Commons.DEVICE.get(Commons.DevicePosition).getTimerAmount(); @@ -1598,7 +1604,7 @@ public class DeviceFragment extends BaseV4Fragment implements ObservableScrollVi // jiaxblue EventBean eventBean = new EventBean(EventBean.BLUETOOTH_STOP_SCAN); EventBus.getDefault().post(eventBean); - showPermissionHint(); + addDevice(); break; @@ -1613,9 +1619,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); @@ -1626,11 +1630,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) { diff --git a/iFish7/src/main/java/com/ifish/fragment/ShopsCheckUserPhotoFragment.java b/iFish7/src/main/java/com/ifish/fragment/ShopsCheckUserPhotoFragment.java index a25086644..faba586d3 100644 --- a/iFish7/src/main/java/com/ifish/fragment/ShopsCheckUserPhotoFragment.java +++ b/iFish7/src/main/java/com/ifish/fragment/ShopsCheckUserPhotoFragment.java @@ -294,7 +294,6 @@ public class ShopsCheckUserPhotoFragment extends BaseFragment { } }); - openDialog.show(); } diff --git a/iFish7/src/main/java/com/ifish/utils/AppRoute.java b/iFish7/src/main/java/com/ifish/utils/AppRoute.java index 11b0c02b9..315b43ebc 100644 --- a/iFish7/src/main/java/com/ifish/utils/AppRoute.java +++ b/iFish7/src/main/java/com/ifish/utils/AppRoute.java @@ -6,11 +6,7 @@ import android.content.ClipboardManager; import android.content.Context; import android.content.Intent; import android.widget.Toast; - -import androidx.annotation.Nullable; - import com.ifish.activity.BlackListActivity; -import com.ifish.activity.HotSpotConnentDeviceActivity; import com.ifish.activity.MainEightControlActivity; import com.ifish.activity.MainFiveBDControlActivity; import com.ifish.activity.MainFiveControlActivity; @@ -27,59 +23,67 @@ import com.ifish.activity.MainThreeControlActivity; import com.ifish.activity.MainTwoControlActivity; import com.ifish.activity.MainZeroControlActivity; import com.ifish.basebean.Device; +import com.ifish.baseclass.BaseGradeActivity; public class AppRoute { - public static void newToStart( Activity activity,Intent i ,Device device){ + + public static void newToStart( Activity activity,Device device,boolean isBind){ if (device!=null){ try { - i.putExtra("device",device); L.i("jjia----deviceBean---"+device.toString()); - toAction(activity,i,device.getControlAmount(),device.getTimerAmount(),device.type); + toAction(activity,device,isBind); }catch (Exception e) { + Intent i = new Intent(); ClipboardManager clipboardManager = (ClipboardManager) activity.getSystemService(Context.CLIPBOARD_SERVICE); ClipData mClipData = ClipData.newPlainText("Label", e.getMessage()); clipboardManager.setPrimaryClip(mClipData); Toast.makeText(activity, "错误日志复制到剪贴板!", Toast.LENGTH_SHORT).show(); i.setClass(activity, MainThreeControlActivity.class); + activity.startActivity(i); + AnimationUtil.startAnimation(activity); } - activity.startActivity(i); - AnimationUtil.startAnimation(activity); + }else { - oldToStart( activity, i ); + if (isBind){ + Toast.makeText(activity, "绑定返回的设备对象信息是空", Toast.LENGTH_SHORT).show(); + } + oldToStart(activity); } } - public static void toAction(Activity activity,Intent i,Integer controlAmount,Integer timerAmount, String type) { - + public static void toAction(Activity activity,Device device,boolean isBind) { + Intent i = new Intent(); + i.putExtra("device",device); + i.putExtra(BaseGradeActivity.BINDDEVICE, isBind);//绑定成功增加经验 if (Commons.FishKey.On.equals(Commons.DEVICE.get(Commons.DevicePosition).isBlacklist)) {//黑名单 i.setClass(activity, BlackListActivity.class); } else { - if (Device.TYPE_1C.equals(type)) { + if (Device.TYPE_1C.equals(device.type)) { i.setClass(activity, MainThree1CControlActivity.class); - } else if (Device.TYPE_AA.equals(type)) { + } else if (Device.TYPE_AA.equals(device.type)) { i.setClass(activity, MainFiveControlActivity.class); - } else if (Device.TYPE_BD.equals(type)) { + } else if (Device.TYPE_BD.equals(device.type)) { i.setClass(activity, MainFiveBDControlActivity.class); - } else if (Device.TYPE_2A.equals(type)) { + } else if (Device.TYPE_2A.equals(device.type)) { i.setClass(activity, MainSix_2A_ControlActivity.class); - } else if (Device.TYPE_2B.equals(type)) { + } else if (Device.TYPE_2B.equals(device.type)) { i.setClass(activity, MainFour_2B_ControlActivity.class); - } else if (Device.TYPE_3A.equals(type)) { + } else if (Device.TYPE_3A.equals(device.type)) { i.setClass(activity, MainHot_3A_ControlActivity.class); - } else if (Device.TYPE_2F.equals(type)) { + } else if (Device.TYPE_2F.equals(device.type)) { i.setClass(activity, MainSeven_2F_ControlActivity.class); - } else if (Device.TYPE_3F.equals(type)) { + } else if (Device.TYPE_3F.equals(device.type)) { i.setClass(activity, MainFour_3F_ControlActivity.class); - } else if (Device.TYPE_4F.equals(type) || Device.TYPE_5F.equals(type)) { + } else if (Device.TYPE_4F.equals(device.type) || Device.TYPE_5F.equals(device.type)) { i.setClass(activity, MainSix_4F_ControlActivity.class); } else { - if (controlAmount == null) {//如果控制器返回空 则默认给三控的页面 + if (device.getControlAmount() == null) {//如果控制器返回空 则默认给三控的页面 i.setClass(activity, MainThreeControlActivity.class); } else { i.setClass(activity, MainThreeControlActivity.class); - switch (controlAmount) { + switch (device.getControlAmount()) { case 0: { i.setClass(activity, MainZeroControlActivity.class); break; @@ -93,7 +97,7 @@ public class AppRoute { break; } case 4: { - if (timerAmount == 6) { // 可丽爱 + if (device.getTimerAmount() == 6) { // 可丽爱 i.setClass(activity, MainFiveControlActivity.class); } else {//4控 i.setClass(activity, MainFourControlActivity.class); @@ -101,7 +105,7 @@ public class AppRoute { break; } case 5: { - if (6 == timerAmount) {//5控六定时器 询多页面 + if (6 == device.getTimerAmount()) {//5控六定时器 询多页面 i.setClass(activity, MainSixControlActivity.class); } break; @@ -118,17 +122,17 @@ public class AppRoute { } } } + activity.startActivity(i); + AnimationUtil.startAnimation(activity); } - public static void oldToStart(Activity activity,Intent i ){ + public static void oldToStart(Activity activity){ + Intent i = new Intent(); try { - Integer controlAmount = Commons.DEVICE.get(Commons.DevicePosition).getControlAmount(); - Integer timerAmount = Commons.DEVICE.get(Commons.DevicePosition).getTimerAmount(); - String type = Commons.DEVICE.get(Commons.DevicePosition).type; - - toAction(activity,i,controlAmount,timerAmount,type); - L.i("jjia-------mainclick--type-"+type); + Device device = Commons.DEVICE.get(Commons.DevicePosition); + toAction(activity,device,false); + L.i("jjia-------mainclick--type-"+device.type); L.i("jjia-------mainclick--"+Commons.DEVICE.get(Commons.DevicePosition).toString()); } catch (Exception e) { @@ -137,8 +141,9 @@ public class AppRoute { clipboardManager.setPrimaryClip(mClipData); Toast.makeText(activity, "错误日志复制到剪贴板!", Toast.LENGTH_SHORT).show(); i.setClass(activity, MainThreeControlActivity.class); + activity.startActivity(i); + AnimationUtil.startAnimation(activity); } - activity.startActivity(i); - AnimationUtil.startAnimation(activity); + } } diff --git a/iFish7/src/main/java/com/ifish/view/IosAlertDialog.java b/iFish7/src/main/java/com/ifish/view/IosAlertDialog.java index cddbd37db..66d6665b1 100644 --- a/iFish7/src/main/java/com/ifish/view/IosAlertDialog.java +++ b/iFish7/src/main/java/com/ifish/view/IosAlertDialog.java @@ -187,6 +187,23 @@ public class IosAlertDialog { return this; } + public IosAlertDialog setPositiveButtonx(String text, + final View.OnClickListener listener) { + showPosBtn = true; + if ("".equals(text)) { + btn_pos.setText("确认"); + } else { + btn_pos.setText(text); + } + btn_pos.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + listener.onClick(v); + } + }); + return this; + } + public IosAlertDialog setNegativeButton(String text, final View.OnClickListener listener) { showNegBtn = true;