修改ping机制,修改网络检测服务

Author: ctj

app/src/main/AndroidManifest.xml

@@ -177,7 +177,7 @@
             android:theme="@style/AppTheme" />
         <!--网络重置监听工具-->
         <activity
-            android:name=".network.NetResetMonitorAty"
+            android:name=".network.NetMonitorAty"
             android:theme="@style/Theme.AppCompat.NoActionBar" />
 
         <activity android:name=".test.TestAty"
@@ -199,7 +199,7 @@
             android:enabled="true"
             android:exported="true" />
         <!--网络重置监听的服务-->
-        <service android:name=".network.NetResetMonitorService"
+        <service android:name=".network.NetMonitorService"
             android:enabled="true"
             android:exported="true" />
         <!--重启后广播监听-->

app/src/main/java/com/wave_chtj/example/FeaturesOptionAty.java

@@ -57,7 +57,7 @@
 import com.wave_chtj.example.install.InstallAPkAty;
 import com.wave_chtj.example.keeplive.KeepAliveAty;
 import com.wave_chtj.example.network.NetChangeAty;
-import com.wave_chtj.example.network.NetResetMonitorAty;
+import com.wave_chtj.example.network.NetMonitorAty;
 import com.wave_chtj.example.screen.ScreenActivity;
 import com.wave_chtj.example.serialport.SerialPortAty;
 import com.wave_chtj.example.socket.SocketAty;
@@ -234,7 +234,7 @@ public void clickByPosition(int position) {
                 startAty(NetChangeAty.class);
                 break;
             case FKey.KEY_RESET_MONITOR:
-                startAty(NetResetMonitorAty.class);
+                startAty(NetMonitorAty.class);
                 break;
             case FKey.KEY_FILEDOWN:
                 startAty(FileDownLoadAty.class);

app/src/main/java/com/wave_chtj/example/StartPageAty.java

@@ -6,7 +6,7 @@
 import androidx.annotation.Nullable;
 
 import com.wave_chtj.example.base.BaseActivity;
-import com.wave_chtj.example.network.NetResetMonitorAty;
+import com.wave_chtj.example.network.NetMonitorAty;
 import com.wave_chtj.example.reboot.RebootAty;
 import com.wave_chtj.example.serialport.SerialPortAty;
 import com.wave_chtj.example.test.TestAty;
@@ -30,7 +30,7 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
         } else if (pkgName.contains(SwitchUtils.FLAG_REBOOT_PKG)) {
             startAty(RebootAty.class);
         } else if (pkgName.contains(SwitchUtils.FLAG_NETMONITOR_PKG)) {
-            startAty(NetResetMonitorAty.class);
+            startAty(NetMonitorAty.class);
         } else if (pkgName.contains(SwitchUtils.FLAG_EXAMPLE_PKG)) {
             startAty(FeaturesOptionAty.class);
         }else if(pkgName.contains("com.zto.ztoexpresscabinet")||pkgName.contains("com.ingenious_eyes.cabinet")){

app/src/main/java/com/wave_chtj/example/network/FLteTools.java

@@ -1,10 +1,9 @@
 package com.wave_chtj.example.network;
 
-public interface NetMonitorCallBack {
-    void getPingResult(boolean isPing);
+public interface INetMonitor {
     void getPingList(String []pingList);
     void getNowTime(String time);
-    void getNetType(String netType);
+    void getNetType(String netType,boolean isPing);
     void getResetErrCount(int errCount);
     void getTotalCount(int totalCount);
     void getDbm(String dBm);

app/src/main/java/com/wave_chtj/example/network/NetMonitorCallBack.java renamed to app/src/main/java/com/wave_chtj/example/network/INetMonitor.java

@@ -0,0 +1,11 @@
+package com.wave_chtj.example.network;
+
+import androidx.annotation.IntDef;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+@IntDef({NetMtools.MODE_HARD, NetMtools.MODE_SOFT, NetMtools.MODE_AIRPLANE, NetMtools.MODE_REBOOT})
+@Retention(RetentionPolicy.SOURCE)
+public @interface IResetModel {
+}

app/src/main/java/com/wave_chtj/example/network/IResetModel.java

@@ -6,6 +6,8 @@
 
 import androidx.annotation.Nullable;
 
+import com.chtj.base_framework.network.FLteTools;
+import com.chtj.base_framework.network.NetDbmListener;
 import com.face_chtj.base_iotutils.KLog;
 import com.face_chtj.base_iotutils.network.NetUtils;
 import com.face_chtj.base_iotutils.display.ToastUtils;
@@ -23,11 +25,13 @@ public class NetChangeAty extends BaseActivity {
     private static final String TAG = "NetChangeAty";
     private TextView tvStatus;
     private TextView tvType;
+    private TextView tvDbm;
 
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_network);
+        tvDbm = findViewById(R.id.tvDbm);
         tvStatus = findViewById(R.id.tvStatus);
         tvType = findViewById(R.id.tvType);
         if(NetUtils.getNetWorkType()==NetUtils.NETWORK_NO){
@@ -49,6 +53,12 @@ public void changed(int netType, boolean isNormal) {
                 tvStatus.setText("" + isNormal);
             }
         });
+        FLteTools.instance().init4GDbm(new NetDbmListener() {
+            @Override
+            public void getDbm(String dbmAsu) {
+                tvDbm.setText("信号值："+dbmAsu);
+            }
+        });
     }
 
     @Override