diff --git a/src/app/src/main/java/wificar/MyVideo.java b/src/app/src/main/java/wificar/MyVideo.java index b4d64ec..4c081ab 100644 --- a/src/app/src/main/java/wificar/MyVideo.java +++ b/src/app/src/main/java/wificar/MyVideo.java @@ -12,8 +12,12 @@ import android.view.View.OnClickListener; import android.view.Window; import android.view.WindowManager; import android.widget.Button; +import android.widget.LinearLayout; +import android.widget.RelativeLayout; import android.widget.Toast; +import androidx.annotation.BinderThread; + import java.io.OutputStream; import java.net.InetAddress; import java.net.Socket; @@ -33,6 +37,7 @@ public class MyVideo extends Activity { private Button ViewPhotos; private Button BtnForward, BtnBackward, BtnLeft, BtnRight, BtnStop; private Socket socket; + private RockerView rockerView; private long exitTime = 0; @Override @@ -55,6 +60,10 @@ public class MyVideo extends Activity { BtnRight = findViewById(R.id.button_right); BtnStop = findViewById(R.id.button_stop); + rockerView = new RockerView(this,socketWriter,this.getApplicationContext(),null); + RelativeLayout.LayoutParams params = new RelativeLayout.LayoutParams(600,600); + addContentView(rockerView,params); + Intent intent = getIntent(); //从Intent当中根据key取得value CameraIp = intent.getStringExtra("CameraIp"); @@ -64,17 +73,14 @@ public class MyVideo extends Activity { Log.d("wifirobot", "CtrlPort is :++++" + CtrlPort); r.GetCameraIP(CameraIp); InitSocket(); - BtnForward.setOnClickListener(new OnClickListener() { - - public void onClick(View arg0) { - // TODO Auto-generated method stub - try { - socketWriter.write(new byte[]{(byte) 0xff, (byte) 0x00, (byte) 0x01, (byte) 0x00, (byte) 0xff}); - socketWriter.flush(); - } catch (Exception e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } + BtnForward.setOnClickListener(arg0 -> { + // TODO Auto-generated method stub + try { + socketWriter.write(new byte[]{(byte) 0xff, (byte) 0x00, (byte) 0x01, (byte) 0x00, (byte) 0xff}); + socketWriter.flush(); + } catch (Exception e) { + // TODO Auto-generated catch block + e.printStackTrace(); } }); diff --git a/src/app/src/main/java/wificar/RockerView.java b/src/app/src/main/java/wificar/RockerView.java index 567bde2..f33388a 100644 --- a/src/app/src/main/java/wificar/RockerView.java +++ b/src/app/src/main/java/wificar/RockerView.java @@ -1,18 +1,22 @@ package wificar; +import android.app.Activity; import android.content.Context; +import android.content.Intent; import android.graphics.Canvas; import android.graphics.Color; import android.graphics.Paint; import android.graphics.RectF; import android.util.AttributeSet; -import android.util.Log; import android.view.MotionEvent; import android.view.View; import androidx.annotation.Nullable; import java.io.OutputStream; +import java.net.InetAddress; +import java.net.Socket; +import java.net.UnknownHostException; public class RockerView extends View{ Paint backPaint = new Paint(); // 背景画笔 @@ -25,8 +29,11 @@ public class RockerView extends View{ Context mContext; OutputStream socketWriter; String status = "STOP"; - public RockerView(Context context, @Nullable AttributeSet attrs) { + private Activity activity; + public RockerView(Activity activity,OutputStream socketWriter,Context context, @Nullable AttributeSet attrs) { super(context, attrs); + this.activity = activity; + this.socketWriter = socketWriter; this.mContext = context; } private void initPaint() { diff --git a/src/app/src/main/res/layout/myvideo.xml b/src/app/src/main/res/layout/myvideo.xml index 7f5aa44..26449bf 100644 --- a/src/app/src/main/res/layout/myvideo.xml +++ b/src/app/src/main/res/layout/myvideo.xml @@ -4,16 +4,15 @@ android:layout_width="fill_parent" android:layout_height="fill_parent" > - - + + + + + + + + + - + + + + + + + + \ No newline at end of file