From 2cf9e2feda72de8e87b8c8b98eaa6ce08df0851c Mon Sep 17 00:00:00 2001 From: jia Date: Sat, 21 Sep 2024 23:45:45 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AD=89=E5=BE=85=E5=B1=82=E7=9A=84=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E9=95=BF=E5=BA=A6=E6=81=A2=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gradle.properties | 4 +- .../newbind/NewBindDeviceActivity.java | 43 +++++++++---------- .../main/java/com/ifish/utils/DialogUtil.kt | 20 ++++----- 3 files changed, 33 insertions(+), 34 deletions(-) diff --git a/gradle.properties b/gradle.properties index 586cb6b9c..4d1bb2c0f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -26,5 +26,5 @@ android.enableJetifier=true android.useAndroidX=true android.useDeprecatedNdk=true -versionCode=51 -versionName=4.11.11 \ No newline at end of file +versionCode=52 +versionName=4.11.12 \ No newline at end of file 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 5ffe3c585..45e5dceca 100644 --- a/iFish7/src/main/java/com/ifish/activity/newbind/NewBindDeviceActivity.java +++ b/iFish7/src/main/java/com/ifish/activity/newbind/NewBindDeviceActivity.java @@ -126,11 +126,12 @@ public class NewBindDeviceActivity extends AppCompatActivity { private SPUtil sp; private Dialog waterTempDialog; String type = null; + private Activity activity; @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_new_bind_device_choice); - + activity = this; ActivityManager.getInstance().addActivity(this); @@ -433,7 +434,7 @@ public class NewBindDeviceActivity extends AppCompatActivity { if (TextUtils.isEmpty(type)){ blueScan(); }else { - DialogUtil.Companion.showLoadingDialog(true,"开始连接蓝牙设备"); + DialogUtil.Companion.showLoadingDialog(activity,true,"开始连接蓝牙设备"); // showProgressDialogCancelble("开始连接蓝牙设备"); connectBle(); } @@ -483,14 +484,14 @@ public class NewBindDeviceActivity extends AppCompatActivity { }else { ToastUtil.show(NewBindDeviceActivity.this,"扫描结束,没有搜索到可用设备"); // dismissProgressDialogCancelble(); - DialogUtil.Companion.setLoadingDialogDismiss(); + DialogUtil.Companion.setLoadingDialogDismiss(activity); } } @Override public void onScanStarted(boolean success) { // ToastUtil.show(NewBindDeviceActivity.this,"开始扫描"); - DialogUtil.Companion.showLoadingDialog(true,"正在搜索附近设备，请确保设备处于配网状态"); + DialogUtil.Companion.showLoadingDialog(activity,true,"正在搜索附近设备，请确保设备处于配网状态"); // showProgressDialogCancelble("正在搜索附近设备，请确保设备处于配网状态"); } @@ -600,7 +601,7 @@ public class NewBindDeviceActivity extends AppCompatActivity { @Override public void onNotifyFailure(BleException exception) { // dismissProgressDialogCancelble(); - DialogUtil.Companion.setLoadingDialogDismiss(); + DialogUtil.Companion.setLoadingDialogDismiss(activity); } @Override @@ -620,19 +621,19 @@ public class NewBindDeviceActivity extends AppCompatActivity { String status = ByteUtil.toHex(model.getStatus()); device_mac = ByteUtil.bytesToHexString(model.getSrc()); - DialogUtil.Companion.setLoadingDialogDismiss(); + DialogUtil.Companion.setLoadingDialogDismiss(activity); if (!TextUtils.isEmpty(device_mac)){ // dismissProgressDialogCancelble(); - DialogUtil.Companion.setLoadingDialogDismiss(); + DialogUtil.Companion.setLoadingDialogDismiss(activity); // showProgressDialogCancelble("正在绑定设备，请稍等..."); - DialogUtil.Companion.showLoadingDialog(true,"正在绑定设备..."); + DialogUtil.Companion.showLoadingDialog(activity,true,"正在绑定设备..."); connectDevice.cancel(); connectDevice.start(); } // checkoutMac(device_mac); } else { - DialogUtil.Companion.setLoadingDialogDismiss(); + DialogUtil.Companion.setLoadingDialogDismiss(activity); // dismissProgressDialogCancelble(); // BackFunctionCode7_11 model = (BackFunctionCode7_11) object; // String status = ByteUtil.toHex(model.getStatus()); @@ -737,7 +738,7 @@ public class NewBindDeviceActivity extends AppCompatActivity { }); } private void resetDevice(int type){ - DialogUtil.Companion.setLoadingDialogDismiss(); + DialogUtil.Companion.setLoadingDialogDismiss(activity); if (1==type){ toDevice(); }else if (2==type){ @@ -777,13 +778,13 @@ public class NewBindDeviceActivity extends AppCompatActivity { BleManager.getInstance().connect(currentDevice, new BleGattCallback() { @Override public void onStartConnect() { - DialogUtil.Companion.showLoadingDialog(true,"开始连接蓝牙设备"); + DialogUtil.Companion.showLoadingDialog(activity,true,"开始连接蓝牙设备"); } @Override public void onConnectFail(BleDevice bleDevice, BleException exception) { ToastUtil.show(NewBindDeviceActivity.this,"连接蓝牙设备失败，请重试"); - DialogUtil.Companion.setLoadingDialogDismiss(); + DialogUtil.Companion.setLoadingDialogDismiss(activity); } @Override @@ -794,7 +795,7 @@ public class NewBindDeviceActivity extends AppCompatActivity { @Override public void onSetMTUFailure(BleException exception) { L.i("jjia-------MTU--"+exception.toString()); - DialogUtil.Companion.setLoadingDialogDismiss(); + DialogUtil.Companion.setLoadingDialogDismiss(activity); } @Override @@ -902,7 +903,7 @@ public class NewBindDeviceActivity extends AppCompatActivity { @Override public void onTick(long millisUntilFinished) { - long sum = millisUntilFinished / 1000; + long sum = millisUntilFinished / 1000 % 2; if (sum == 0) { if (!act.isFinishing() && isContinue) { isNetWorkAvailable("www.baidu.com", new Comparable() { @@ -910,10 +911,10 @@ public class NewBindDeviceActivity extends AppCompatActivity { @Override public int compareTo(Boolean available) { if (available) { - // TODO 设备访问Internet正常 toReset(); isContinue = false; connectDevice.cancel(); + L.i("jjia-----------调用绑定接口---"); doPostBindDevice(); } @@ -927,9 +928,7 @@ public class NewBindDeviceActivity extends AppCompatActivity { @Override public void onFinish() { if (isContinue) { -// dismissProgressDialog(); -// dismissProgressDialogCancelble(); - DialogUtil.Companion.setLoadingDialogDismiss(); + DialogUtil.Companion.setLoadingDialogDismiss(activity); } } } @@ -1041,19 +1040,19 @@ public class NewBindDeviceActivity extends AppCompatActivity { @Override public void finish() { - DialogUtil.Companion.setLoadingDialogDismiss(); + DialogUtil.Companion.setLoadingDialogDismiss(activity); deviceIsNullHandler.sendEmptyMessage(result); } @Override public void error(Exception e, String msg) { - DialogUtil.Companion.setLoadingDialogDismiss(); + DialogUtil.Companion.setLoadingDialogDismiss(activity); result = Commons.NetWork.ERROR; } }, deviceObj.getDeviceId(), Commons.USER.getUserId()); } catch (Exception e) { e.printStackTrace(); - DialogUtil.Companion.setLoadingDialogDismiss(); + DialogUtil.Companion.setLoadingDialogDismiss(activity); } } }; @@ -1178,7 +1177,7 @@ public class NewBindDeviceActivity extends AppCompatActivity { } catch (Exception e) { i.setClass(NewBindDeviceActivity.this, MainThreeControlActivity.class); } - DialogUtil.Companion.setLoadingDialogDismiss(); + DialogUtil.Companion.setLoadingDialogDismiss(activity); i.putExtra(BaseGradeActivity.BINDDEVICE, true);//绑定成功增加经验 ToastUtil.show(NewBindDeviceActivity.this, "绑定设备成功"); startActivity(i); diff --git a/iFish7/src/main/java/com/ifish/utils/DialogUtil.kt b/iFish7/src/main/java/com/ifish/utils/DialogUtil.kt index a0207d48e..87607510e 100644 --- a/iFish7/src/main/java/com/ifish/utils/DialogUtil.kt +++ b/iFish7/src/main/java/com/ifish/utils/DialogUtil.kt @@ -1,5 +1,8 @@ package com.ifish.utils +import android.app.Activity +import com.ifish.baseclass.BaseActivity + /** * Created by achang on 2018/10/6. */ @@ -9,28 +12,25 @@ class DialogUtil { var mLoadingDialog: LoadingDialog? = null var showDialog:Boolean=false var hint:String?="正在加载中，请稍等片刻..." - fun showLoadingDialog(showDialog:Boolean,hint:String?="正在加载中，请稍等片刻..."): LoadingDialog { + fun showLoadingDialog(activity: Activity?, showDialog:Boolean, hint:String?="正在加载中，请稍等片刻..."): LoadingDialog { this.showDialog= showDialog - if (mLoadingDialog == null&& ActivityManager.getInstance().lastActivity()!=null) { - mLoadingDialog = LoadingDialog(ActivityManager.getInstance().lastActivity()!!,hint) - if (!mLoadingDialog!!.isShowing && ActivityManager.getInstance().lastActivity() != null && !ActivityManager.getInstance().lastActivity()!!.isFinishing) { + if (mLoadingDialog == null && activity !=null) { + mLoadingDialog = LoadingDialog(activity,hint) + if (!mLoadingDialog!!.isShowing && !activity.isFinishing) { mLoadingDialog!!.show() } } else { - if (!mLoadingDialog!!.isShowing && ActivityManager.getInstance().lastActivity() != null && !ActivityManager.getInstance().lastActivity()!!.isFinishing) { + if (!mLoadingDialog!!.isShowing && activity != null && !activity.isFinishing) { mLoadingDialog!!.show() } } - /* mLoadingDialog?.apply { - LogUtil.logD(isShowing.toString()+"======="+ AppManagerUtil.lastActivity.toString()+"==="+(mLoadingDialog==null)) - }*/ return mLoadingDialog!! } - fun setLoadingDialogDismiss() { + fun setLoadingDialogDismiss(activity: Activity?) { mLoadingDialog?.apply { if (this.isShowing ) { - ActivityManager.getInstance().lastActivity()?.apply { + activity?.apply { if (!this.isFinishing) mLoadingDialog!!.dismiss() mLoadingDialog = null