root
/
iFish7
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

等待层的时间长度恢复

This commit is contained in:
jia 2024-09-21 23:45:45 +08:00
parent 695487920f
commit 2cf9e2feda
3 changed files with 33 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gradle.properties
View File

@ -26,5 +26,5 @@ android.enableJetifier=true
android.useAndroidX=true
android.useDeprecatedNdk=true
versionCode=51
versionName=4.11.11
versionCode=52
versionName=4.11.12

43
iFish7/src/main/java/com/ifish/activity/newbind/NewBindDeviceActivity.java
View File

@ -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<Boolean>() {
@ -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);

20
iFish7/src/main/java/com/ifish/utils/DialogUtil.kt
View File

@ -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