Skip to content

Commit deb2a76

Browse files
author
ctj
committed
优化ping机制 修改dns列表
1 parent 24e4671 commit deb2a76

File tree

12 files changed

+173
-194
lines changed

12 files changed

+173
-194
lines changed

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ allprojects {
2525
```groovy
2626
dependencies {
2727
//多个物联网相关基础工具类
28-
implementation 'com.github.wave-chtj:BaseIotUtils:1.4.6'
28+
implementation 'com.github.wave-chtj:BaseIotUtils:1.4.8'
2929
}
3030
```
3131

‎app/src/main/java/com/wave_chtj/example/network/INetMonitor.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,5 @@ public interface INetMonitor {
77
void getResetErrCount(int errCount);
88
void getTotalCount(int totalCount);
99
void getDbm(String dBm);
10+
void taskStatus(boolean isRunning);
1011
}

‎app/src/main/java/com/wave_chtj/example/network/NetMonitorAty.java

Lines changed: 31 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import com.face_chtj.base_iotutils.ShellUtils;
2525
import com.face_chtj.base_iotutils.convert.TimeUtils;
2626
import com.face_chtj.base_iotutils.display.ToastUtils;
27+
import com.face_chtj.base_iotutils.network.NetUtils;
2728
import com.wave_chtj.example.R;
2829
import com.wave_chtj.example.StartPageAty;
2930
import com.wave_chtj.example.base.BaseActivity;
@@ -32,11 +33,10 @@
3233
import java.util.Arrays;
3334

3435
public class NetMonitorAty extends BaseActivity implements CompoundButton.OnCheckedChangeListener, INetMonitor {
35-
private static final String TAG = NetMonitorAty.class.getSimpleName() + "F";
3636
private boolean isBound = false;
3737
private NetMonitorService nService;
3838
private TextView tvResetMode, tvNowTime, tvNetResult, tvNetType, tvPingList,
39-
tvResetErrCount, tvInputAddrResult, tvTotalCount, tvDbm, tvModeResetTitle;
39+
tvResetErrCount, tvInputAddrResult, tvTotalCount, tvDbm, tvModeResetTitle, tvTaskStatus;
4040
private RadioButton btnHard, btnSoft, rbOne, rbMore, rbRebootYes, rbRebootNo;
4141
private Button btnAirplaneMode, btnRestartMode;
4242
private EditText etAddress;
@@ -46,12 +46,11 @@ public class NetMonitorAty extends BaseActivity implements CompoundButton.OnChec
4646
protected void onCreate(Bundle savedInstanceState) {
4747
super.onCreate(savedInstanceState);
4848
setContentView(R.layout.activity_net_reset_monitor);
49-
KLog.d(TAG, "onCreate ");
5049
rbRebootYes = findViewById(R.id.rbRebootYes);
5150
rbRebootYes.setOnCheckedChangeListener(this);
51+
tvTaskStatus = findViewById(R.id.tvTaskStatus);
5252
rbRebootNo = findViewById(R.id.rbRebootNo);
5353
rbRebootNo.setOnCheckedChangeListener(this);
54-
;
5554
tvDbm = findViewById(R.id.tvDbm);
5655
tvResetMode = findViewById(R.id.tvResetMode);
5756
tvNowTime = findViewById(R.id.tvNowTime);
@@ -74,35 +73,26 @@ protected void onCreate(Bundle savedInstanceState) {
7473
llFifteenView = findViewById(R.id.llFifteenView);
7574
llResetExeu = findViewById(R.id.llResetExeu);
7675

76+
startBindService();
77+
}
78+
79+
public void startBindService() {
7780
Intent intent = new Intent(this, NetMonitorService.class);
7881
startService(intent);
7982
bindService(intent, conn, Context.BIND_AUTO_CREATE);
8083
AppManager.getAppManager().finishActivity(StartPageAty.class);
81-
IntentFilter intentFilter = new IntentFilter(Intent.ACTION_AIRPLANE_MODE_CHANGED);
82-
registerReceiver(mReceiver, intentFilter);
8384
}
8485

85-
BroadcastReceiver mReceiver = new AirplaneModeBroadcastReceiver();
86-
87-
88-
private class AirplaneModeBroadcastReceiver extends BroadcastReceiver {
89-
@Override
90-
public void onReceive(Context context, Intent intent) {
91-
String action = intent.getAction();
92-
if (action.equals(Intent.ACTION_AIRPLANE_MODE_CHANGED)) {
93-
KLog.d(TAG, "onReceive ACTION_AIRPLANE_MODE_CHANGED");
94-
}
95-
}
96-
}
9786

9887
private ServiceConnection conn = new ServiceConnection() {
9988
@Override
10089
public void onServiceConnected(ComponentName name, IBinder binder) {
101-
KLog.d(TAG, "onServiceConnected ");
90+
KLog.d("onServiceConnected ");
10291
isBound = true;
10392
NetMonitorService.NetBinder myBinder = (NetMonitorService.NetBinder) binder;
10493
nService = myBinder.getService();
10594
if (nService == null) {
95+
KLog.d("service_start_err() 1");
10696
ToastUtils.error(getString(R.string.service_start_err));
10797
return;
10898
}
@@ -126,7 +116,7 @@ public void onServiceConnected(ComponentName name, IBinder binder) {
126116
@Override
127117
public void onServiceDisconnected(ComponentName name) {
128118
isBound = false;
129-
KLog.d(TAG, "onServiceDisconnected ");
119+
KLog.d("onServiceDisconnected ");
130120
}
131121
};
132122

@@ -138,14 +128,14 @@ public void initViewTitle() {
138128
tvPingList.setText(String.format(getString(R.string.ping_list), "..."));
139129
tvNowTime.setText(String.format(getString(R.string.now_time), "..."));
140130
tvDbm.setText(String.format(getString(R.string.net_dbm), "..."));
131+
tvTaskStatus.setText(String.format(getString(R.string.task_status), "..."));
141132
}
142133

143134
/**
144135
* 改变标题的UI
145136
*/
146137
public void changeResetModeTitle() {
147138
int resetMode = nService.getResetModeValue();
148-
KLog.d(TAG, "changeResetModeTitle resetMode=" + resetMode);
149139
tvResetMode.setText(String.format(getString(R.string.net_reset_mode), nService.getResetMode()));
150140
if (resetMode == NetMtools.MODE_HARD || resetMode == NetMtools.MODE_SOFT) {
151141
if (resetMode == NetMtools.MODE_HARD) {
@@ -199,7 +189,7 @@ public void btnRestartModeClick(View view) {
199189
nService.setModeRestartCallBack(NetMtools.MODE_REBOOT);
200190
changeResetModeTitle();
201191
//ToastUtils.success(getString(R.string.service_start_succ));
202-
KLog.d(TAG, "btnAirplaneModeClick ");
192+
KLog.d("btnAirplaneModeClick ");
203193
} else {
204194
ToastUtils.error(getString(R.string.service_start_err));
205195
}
@@ -216,7 +206,7 @@ public void btnAirplaneModeClick(View view) {
216206
nService.setModeRestartCallBack(NetMtools.MODE_AIRPLANE);
217207
changeResetModeTitle();
218208
//ToastUtils.success(getString(R.string.service_start_succ));
219-
KLog.d(TAG, "btnAirplaneModeClick ");
209+
KLog.d("btnAirplaneModeClick ");
220210
} else {
221211
ToastUtils.error(getString(R.string.service_start_err));
222212
}
@@ -233,7 +223,7 @@ public void btnHardClick(View view) {
233223
nService.setModeRestartCallBack(NetMtools.MODE_HARD);
234224
changeResetModeTitle();
235225
//ToastUtils.success(getString(R.string.service_start_succ));
236-
KLog.d(TAG, "btnHardClick ");
226+
KLog.d("btnHardClick ");
237227
} else {
238228
ToastUtils.error(getString(R.string.service_start_err));
239229
}
@@ -250,7 +240,7 @@ public void btnSoftClick(View view) {
250240
nService.setModeRestartCallBack(NetMtools.MODE_SOFT);
251241
changeResetModeTitle();
252242
//ToastUtils.success(getString(R.string.service_start_succ));
253-
KLog.d(TAG, "btnSoftClick ");
243+
KLog.d("btnSoftClick ");
254244
} else {
255245
ToastUtils.error(getString(R.string.service_start_err));
256246
}
@@ -294,77 +284,76 @@ public void pingClick(View view) {
294284
return;
295285
}
296286
String[] dnsList = new String[]{address};
297-
boolean isPing = NetMtools.checkNetWork(dnsList, 1, 1);
287+
boolean isPing = NetUtils.checkNetWork(dnsList, 1, 1);
298288
tvInputAddrResult.setText(String.format(getString(R.string.ping_addr_result), (isPing ? getString(R.string.ping_ok) : getString(R.string.ping_err)), TimeUtils.getTodayDateHms("yyyy-MM-dd HH:mm:ss")));
299289
}
300290

301291
@Override
302292
public void getPingList(String[] pingList) {
303-
KLog.d(TAG, "getPingList pingList=" + Arrays.toString(pingList));
304293
tvPingList.setText(String.format(getString(R.string.ping_list), Arrays.toString(pingList)));
305294
}
306295

307296
@Override
308297
public void getNowTime(String time) {
309-
KLog.d(TAG, "getNowTime time=" + time);
310298
tvNowTime.setText(String.format(getString(R.string.now_time), time));
311299
}
312300

313301
@Override
314-
public void getNetType(String netType,boolean isPing) {
315-
KLog.d(TAG, "getNetType netType=" + netType+"isPing=" + isPing);
302+
public void getNetType(String netType, boolean isPing) {
316303
tvNetType.setText(String.format(getString(R.string.net_type), netType));
317304
tvNetResult.setText(getString(isPing ? R.string.net_ok : R.string.net_err));
318305
}
319306

320307
@Override
321308
public void getResetErrCount(int errCount) {
322-
KLog.d(TAG, "getResetErrCount errCount=" + errCount);
323309
tvResetErrCount.setText(String.format(getString(R.string.net_reset_err_count), errCount + ""));
324310
}
325311

326312
@Override
327313
public void getTotalCount(int totalCount) {
328-
KLog.d(TAG, "getTotalCount totalCount=" + totalCount);
329314
tvTotalCount.setText(String.format(getString(R.string.net_reset_total_count), totalCount + ""));
330315
}
331316

332317
@Override
333318
public void getDbm(String dBm) {
334-
KLog.d(TAG, "getDbm dBm=" + dBm);
335319
tvDbm.setText(String.format(getString(R.string.net_dbm), dBm + ""));
336320
}
337321

322+
@Override
323+
public void taskStatus(boolean isRunning) {
324+
tvTaskStatus.setText(String.format(getString(R.string.task_status), isRunning ? "正在运行" : "已停止"));
325+
}
326+
338327
@Override
339328
public void onCheckedChanged(CompoundButton bv, boolean isChecked) {
340-
if (isChecked) {
329+
if (isChecked && bv.isPressed()) {
341330
switch (bv.getId()) {
342331
case R.id.rbOne:
343-
Log.d(TAG, "onCheckedChanged: rbOne");
332+
KLog.d("onCheckedChanged: rbOne");
344333
if (nService != null) {
345334
nService.setCyclesCount(1);
346335
} else {
347336
ToastUtils.error(getString(R.string.service_start_err));
348337
}
349338
break;
350339
case R.id.rbMore:
351-
Log.d(TAG, "onCheckedChanged: rbMore");
340+
KLog.d("onCheckedChanged: rbMore");
352341
if (nService != null) {
353342
nService.setCyclesCount(0);
354343
} else {
355344
ToastUtils.error(getString(R.string.service_start_err));
356345
}
357346
break;
358347
case R.id.rbRebootYes:
359-
Log.d(TAG, "onCheckedChanged: rbRebootYes");
348+
KLog.d("onCheckedChanged: rbRebootYes");
360349
if (nService != null) {
361350
nService.setDefaultTimerdAchieve(true);
362351
} else {
363352
ToastUtils.error(getString(R.string.service_start_err));
364353
}
365354
break;
366355
case R.id.rbRebootNo:
367-
Log.d(TAG, "onCheckedChanged: rbRebootNo");
356+
KLog.d("onCheckedChanged: rbRebootNo");
368357
if (nService != null) {
369358
nService.setDefaultTimerdAchieve(false);
370359
} else {
@@ -378,12 +367,10 @@ public void onCheckedChanged(CompoundButton bv, boolean isChecked) {
378367
@Override
379368
protected void onDestroy() {
380369
super.onDestroy();
381-
KLog.d(TAG, "onDestroy ");
382-
if (isBound || nService != null) {
383-
try {
384-
unbindService(conn);
385-
} catch (Throwable e) {
386-
}
370+
KLog.d("onDestroy >> ");
371+
try {
372+
unbindService(conn);
373+
} catch (Throwable e) {
387374
}
388375
}
389376
}

0 commit comments

Comments
 (0)