7寸分机测试模式中增加网卡断电测试

android_bed/src/main/h7_3128/java/com/wdkl/app/ncs/callingbed/fragment/TestFragment.kt

@@ -1,15 +1,13 @@
 package com.wdkl.app.ncs.callingbed.fragment
 
 import android.hardware.Camera
+import android.text.method.ScrollingMovementMethod
 import android.view.SurfaceHolder
 import android.view.View
 import com.enation.javashop.net.engine.model.NetState
 import com.wdkl.app.ncs.callingbed.R
 import com.wdkl.app.ncs.callingbed.databinding.TestFragmentLayBinding
-import com.wdkl.app.ncs.callingbed.helper.MediaPlayHelper
-import com.wdkl.app.ncs.callingbed.helper.RecordHelper
-import com.wdkl.app.ncs.callingbed.helper.SerialPortHelper
-import com.wdkl.app.ncs.callingbed.helper.SoundPoolManager
+import com.wdkl.app.ncs.callingbed.helper.*
 import com.wdkl.app.ncs.callingbed.launch.CallingbedLaunch
 import com.wdkl.ncs.android.lib.base.BaseFragment
 import com.wdkl.ncs.android.lib.vo.filter
@@ -31,6 +29,8 @@ class TestFragment : BaseFragment<QrCodeFragmentPresenter, TestFragmentLayBindin
     var testButton2 = false
     var testButton3 = false
 
+    var netOff = false
+
     private var mCamera: Camera? = null
 
     override fun getLayId(): Int {
@@ -44,6 +44,8 @@ class TestFragment : BaseFragment<QrCodeFragmentPresenter, TestFragmentLayBindin
     override fun init() {
         RecordHelper.getInstance().init()
         SoundPoolManager.getInstance().playSound(4, 1.0f, 1.0f, 0)
+        tv_test_info.movementMethod = ScrollingMovementMethod.getInstance()
+        tv_ip.text = "IP:" + NetHelper.getInstance().localIP
 
         startCameraPreview()
     }
@@ -54,6 +56,35 @@ class TestFragment : BaseFragment<QrCodeFragmentPresenter, TestFragmentLayBindin
             //开始测试
             startTest()
         }*/
+
+        btn_reset.setOnClickListener {
+            SerialPortHelper.resetDevice()
+        }
+
+        btn_net_off.setOnClickListener {
+            if (netOff) {
+                netOff = false
+                SerialPortHelper.netOff(false)
+            } else {
+                netOff = true
+                SerialPortHelper.netOff(true)
+            }
+            btn_net_off.isEnabled = false
+
+            Thread {
+                try {
+                    Thread.sleep(5000)
+
+                    activity.runOnUiThread {
+                        tv_ip.text = "IP:" + NetHelper.getInstance().localIP
+                        btn_net_off.isEnabled = true
+                    }
+
+                } catch (ex: Exception) {
+                    //
+                }
+            }.start()
+        }
     }
 
     private fun startTest() {

android_bed/src/main/h7_3128/java/com/wdkl/app/ncs/callingbed/helper/SerialPortHelper.java

@@ -62,4 +62,13 @@ public class SerialPortHelper {
             SerialPortUtil.getInstance().sendCommand(SerialPortUtil.NET_STATUS, "1", "F");
         }
     }
+
+    //网卡断电
+    public static void netOff(boolean off) {
+        if (off) {
+            SerialPortUtil.getInstance().sendCommand(SerialPortUtil.RTLRESET, "1", "F");
+        } else {
+            SerialPortUtil.getInstance().sendCommand(SerialPortUtil.RTLRESET, "0", "F");
+        }
+    }
 }

android_bed/src/main/h7_3128/res/layout/test_fragment_lay.xml

@@ -14,10 +14,50 @@
         android:text="Start"
         android:textSize="28sp"/>-->
 
-    <SurfaceView
-        android:id="@+id/camera_preview_surface"
-        android:layout_width="160dp"
-        android:layout_height="160dp" />
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+        <SurfaceView
+            android:id="@+id/camera_preview_surface"
+            android:layout_width="160dp"
+            android:layout_height="160dp" />
+
+        <!--<Button
+            android:id="@+id/btn_sos_test"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_margin="10dp"
+            android:text="SOS"
+            android:textSize="28sp"/>-->
+
+        <Button
+            android:id="@+id/btn_reset"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_margin="10dp"
+            android:layout_toRightOf="@id/camera_preview_surface"
+            android:text="重置"
+            android:textSize="28sp"/>
+
+        <Button
+            android:id="@+id/btn_net_off"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_margin="10dp"
+            android:layout_toRightOf="@id/btn_reset"
+            android:text="网络开关"
+            android:textSize="28sp"/>
+
+        <TextView
+            android:id="@+id/tv_ip"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="10dp"
+            android:layout_toRightOf="@id/camera_preview_surface"
+            android:layout_below="@id/btn_reset"
+            android:textSize="20sp"
+            android:text="IP:"/>
+    </RelativeLayout>
 
     <TextView
         android:id="@+id/tv_camera"

bedlib/src/main/java/serialporttest/utils/SerialPortUtil.java

@@ -473,6 +473,8 @@ public class SerialPortUtil {
      */
     public static final String NET_STATUS = "NETRESET";
 
+    public static final String RTLRESET = "RTLRESET";
+
     /**
      * 心跳控制<br>
      * 若MCU在10秒内没有收到信号，将自动重启Android.  随机数为“W”时将关闭心跳<br>