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.useAndroidX=true
android.useDeprecatedNdk=true android.useDeprecatedNdk=true
versionCode=51 versionCode=52
versionName=4.11.11 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 SPUtil sp;
private Dialog waterTempDialog; private Dialog waterTempDialog;
String type = null; String type = null;
private Activity activity;
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
setContentView(R.layout.activity_new_bind_device_choice); setContentView(R.layout.activity_new_bind_device_choice);
activity = this;
ActivityManager.getInstance().addActivity(this); ActivityManager.getInstance().addActivity(this);
@ -433,7 +434,7 @@ public class NewBindDeviceActivity extends AppCompatActivity {
if (TextUtils.isEmpty(type)){ if (TextUtils.isEmpty(type)){
blueScan(); blueScan();
}else { }else {
DialogUtil.Companion.showLoadingDialog(true,"开始连接蓝牙设备"); DialogUtil.Companion.showLoadingDialog(activity,true,"开始连接蓝牙设备");
// showProgressDialogCancelble("开始连接蓝牙设备"); // showProgressDialogCancelble("开始连接蓝牙设备");
connectBle(); connectBle();
} }
@ -483,14 +484,14 @@ public class NewBindDeviceActivity extends AppCompatActivity {
}else { }else {
ToastUtil.show(NewBindDeviceActivity.this,"扫描结束,没有搜索到可用设备"); ToastUtil.show(NewBindDeviceActivity.this,"扫描结束,没有搜索到可用设备");
// dismissProgressDialogCancelble(); // dismissProgressDialogCancelble();
DialogUtil.Companion.setLoadingDialogDismiss(); DialogUtil.Companion.setLoadingDialogDismiss(activity);
} }
} }
@Override @Override
public void onScanStarted(boolean success) { public void onScanStarted(boolean success) {
// ToastUtil.show(NewBindDeviceActivity.this,"开始扫描"); // ToastUtil.show(NewBindDeviceActivity.this,"开始扫描");
DialogUtil.Companion.showLoadingDialog(true,"正在搜索附近设备，请确保设备处于配网状态"); DialogUtil.Companion.showLoadingDialog(activity,true,"正在搜索附近设备，请确保设备处于配网状态");
// showProgressDialogCancelble("正在搜索附近设备，请确保设备处于配网状态"); // showProgressDialogCancelble("正在搜索附近设备，请确保设备处于配网状态");
} }
@ -600,7 +601,7 @@ public class NewBindDeviceActivity extends AppCompatActivity {
@Override @Override
public void onNotifyFailure(BleException exception) { public void onNotifyFailure(BleException exception) {
// dismissProgressDialogCancelble(); // dismissProgressDialogCancelble();
DialogUtil.Companion.setLoadingDialogDismiss(); DialogUtil.Companion.setLoadingDialogDismiss(activity);
} }
@Override @Override
@ -620,19 +621,19 @@ public class NewBindDeviceActivity extends AppCompatActivity {
String status = ByteUtil.toHex(model.getStatus()); String status = ByteUtil.toHex(model.getStatus());
device_mac = ByteUtil.bytesToHexString(model.getSrc()); device_mac = ByteUtil.bytesToHexString(model.getSrc());
DialogUtil.Companion.setLoadingDialogDismiss(); DialogUtil.Companion.setLoadingDialogDismiss(activity);
if (!TextUtils.isEmpty(device_mac)){ if (!TextUtils.isEmpty(device_mac)){
// dismissProgressDialogCancelble(); // dismissProgressDialogCancelble();
DialogUtil.Companion.setLoadingDialogDismiss(); DialogUtil.Companion.setLoadingDialogDismiss(activity);
// showProgressDialogCancelble("正在绑定设备，请稍等..."); // showProgressDialogCancelble("正在绑定设备，请稍等...");
DialogUtil.Companion.showLoadingDialog(true,"正在绑定设备..."); DialogUtil.Companion.showLoadingDialog(activity,true,"正在绑定设备...");
connectDevice.cancel(); connectDevice.cancel();
connectDevice.start(); connectDevice.start();
} }
// checkoutMac(device_mac); // checkoutMac(device_mac);
} else { } else {
DialogUtil.Companion.setLoadingDialogDismiss(); DialogUtil.Companion.setLoadingDialogDismiss(activity);
// dismissProgressDialogCancelble(); // dismissProgressDialogCancelble();
// BackFunctionCode7_11 model = (BackFunctionCode7_11) object; // BackFunctionCode7_11 model = (BackFunctionCode7_11) object;
// String status = ByteUtil.toHex(model.getStatus()); // String status = ByteUtil.toHex(model.getStatus());
@ -737,7 +738,7 @@ public class NewBindDeviceActivity extends AppCompatActivity {
}); });
} }
private void resetDevice(int type){ private void resetDevice(int type){
DialogUtil.Companion.setLoadingDialogDismiss(); DialogUtil.Companion.setLoadingDialogDismiss(activity);
if (1==type){ if (1==type){
toDevice(); toDevice();
}else if (2==type){ }else if (2==type){
@ -777,13 +778,13 @@ public class NewBindDeviceActivity extends AppCompatActivity {
BleManager.getInstance().connect(currentDevice, new BleGattCallback() { BleManager.getInstance().connect(currentDevice, new BleGattCallback() {
@Override @Override
public void onStartConnect() { public void onStartConnect() {
DialogUtil.Companion.showLoadingDialog(true,"开始连接蓝牙设备"); DialogUtil.Companion.showLoadingDialog(activity,true,"开始连接蓝牙设备");
} }
@Override @Override
public void onConnectFail(BleDevice bleDevice, BleException exception) { public void onConnectFail(BleDevice bleDevice, BleException exception) {
ToastUtil.show(NewBindDeviceActivity.this,"连接蓝牙设备失败，请重试"); ToastUtil.show(NewBindDeviceActivity.this,"连接蓝牙设备失败，请重试");
DialogUtil.Companion.setLoadingDialogDismiss(); DialogUtil.Companion.setLoadingDialogDismiss(activity);
} }
@Override @Override
@ -794,7 +795,7 @@ public class NewBindDeviceActivity extends AppCompatActivity {
@Override @Override
public void onSetMTUFailure(BleException exception) { public void onSetMTUFailure(BleException exception) {
L.i("jjia-------MTU--"+exception.toString()); L.i("jjia-------MTU--"+exception.toString());
DialogUtil.Companion.setLoadingDialogDismiss(); DialogUtil.Companion.setLoadingDialogDismiss(activity);
} }
@Override @Override
@ -902,7 +903,7 @@ public class NewBindDeviceActivity extends AppCompatActivity {
@Override @Override
public void onTick(long millisUntilFinished) { public void onTick(long millisUntilFinished) {
long sum = millisUntilFinished / 1000; long sum = millisUntilFinished / 1000 % 2;
if (sum == 0) { if (sum == 0) {
if (!act.isFinishing() && isContinue) { if (!act.isFinishing() && isContinue) {
isNetWorkAvailable("www.baidu.com", new Comparable<Boolean>() { isNetWorkAvailable("www.baidu.com", new Comparable<Boolean>() {
@ -910,10 +911,10 @@ public class NewBindDeviceActivity extends AppCompatActivity {
@Override @Override
public int compareTo(Boolean available) { public int compareTo(Boolean available) {
if (available) { if (available) {
// TODO 设备访问Internet正常
toReset(); toReset();
isContinue = false; isContinue = false;
connectDevice.cancel(); connectDevice.cancel();
L.i("jjia-----------调用绑定接口---");
doPostBindDevice(); doPostBindDevice();
} }
@ -927,9 +928,7 @@ public class NewBindDeviceActivity extends AppCompatActivity {
@Override @Override
public void onFinish() { public void onFinish() {
if (isContinue) { if (isContinue) {
// dismissProgressDialog(); DialogUtil.Companion.setLoadingDialogDismiss(activity);
// dismissProgressDialogCancelble();
DialogUtil.Companion.setLoadingDialogDismiss();
} }
} }
} }
@ -1041,19 +1040,19 @@ public class NewBindDeviceActivity extends AppCompatActivity {
@Override @Override
public void finish() { public void finish() {
DialogUtil.Companion.setLoadingDialogDismiss(); DialogUtil.Companion.setLoadingDialogDismiss(activity);
deviceIsNullHandler.sendEmptyMessage(result); deviceIsNullHandler.sendEmptyMessage(result);
} }
@Override @Override
public void error(Exception e, String msg) { public void error(Exception e, String msg) {
DialogUtil.Companion.setLoadingDialogDismiss(); DialogUtil.Companion.setLoadingDialogDismiss(activity);
result = Commons.NetWork.ERROR; result = Commons.NetWork.ERROR;
} }
}, deviceObj.getDeviceId(), Commons.USER.getUserId()); }, deviceObj.getDeviceId(), Commons.USER.getUserId());
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
DialogUtil.Companion.setLoadingDialogDismiss(); DialogUtil.Companion.setLoadingDialogDismiss(activity);
} }
} }
}; };
@ -1178,7 +1177,7 @@ public class NewBindDeviceActivity extends AppCompatActivity {
} catch (Exception e) { } catch (Exception e) {
i.setClass(NewBindDeviceActivity.this, MainThreeControlActivity.class); i.setClass(NewBindDeviceActivity.this, MainThreeControlActivity.class);
} }
DialogUtil.Companion.setLoadingDialogDismiss(); DialogUtil.Companion.setLoadingDialogDismiss(activity);
i.putExtra(BaseGradeActivity.BINDDEVICE, true);//绑定成功增加经验 i.putExtra(BaseGradeActivity.BINDDEVICE, true);//绑定成功增加经验
ToastUtil.show(NewBindDeviceActivity.this, "绑定设备成功"); ToastUtil.show(NewBindDeviceActivity.this, "绑定设备成功");
startActivity(i); startActivity(i);

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

@ -1,5 +1,8 @@
package com.ifish.utils package com.ifish.utils
import android.app.Activity
import com.ifish.baseclass.BaseActivity
/** /**
* Created by achang on 2018/10/6. * Created by achang on 2018/10/6.
*/ */
@ -9,28 +12,25 @@ class DialogUtil {
var mLoadingDialog: LoadingDialog? = null var mLoadingDialog: LoadingDialog? = null
var showDialog:Boolean=false var showDialog:Boolean=false
var hint:String?="正在加载中，请稍等片刻..." var hint:String?="正在加载中，请稍等片刻..."
fun showLoadingDialog(showDialog:Boolean,hint:String?="正在加载中，请稍等片刻..."): LoadingDialog { fun showLoadingDialog(activity: Activity?, showDialog:Boolean, hint:String?="正在加载中，请稍等片刻..."): LoadingDialog {
this.showDialog= showDialog this.showDialog= showDialog
if (mLoadingDialog == null&& ActivityManager.getInstance().lastActivity()!=null) { if (mLoadingDialog == null && activity !=null) {
mLoadingDialog = LoadingDialog(ActivityManager.getInstance().lastActivity()!!,hint) mLoadingDialog = LoadingDialog(activity,hint)
if (!mLoadingDialog!!.isShowing && ActivityManager.getInstance().lastActivity() != null && !ActivityManager.getInstance().lastActivity()!!.isFinishing) { if (!mLoadingDialog!!.isShowing && !activity.isFinishing) {
mLoadingDialog!!.show() mLoadingDialog!!.show()
} }
} else { } else {
if (!mLoadingDialog!!.isShowing && ActivityManager.getInstance().lastActivity() != null && !ActivityManager.getInstance().lastActivity()!!.isFinishing) { if (!mLoadingDialog!!.isShowing && activity != null && !activity.isFinishing) {
mLoadingDialog!!.show() mLoadingDialog!!.show()
} }
} }
/* mLoadingDialog?.apply {
LogUtil.logD(isShowing.toString()+"======="+ AppManagerUtil.lastActivity.toString()+"==="+(mLoadingDialog==null))
}*/
return mLoadingDialog!! return mLoadingDialog!!
} }
fun setLoadingDialogDismiss() { fun setLoadingDialogDismiss(activity: Activity?) {
mLoadingDialog?.apply { mLoadingDialog?.apply {
if (this.isShowing ) { if (this.isShowing ) {
ActivityManager.getInstance().lastActivity()?.apply { activity?.apply {
if (!this.isFinishing) if (!this.isFinishing)
mLoadingDialog!!.dismiss() mLoadingDialog!!.dismiss()
mLoadingDialog = null mLoadingDialog = null