Merge remote-tracking branch 'origin/master'

src/app/src/main/java/wificar/MyMainFrm.java

@@ -27,7 +27,6 @@ import my.wificar.R;
 
 public class MyMainFrm extends Activity {
     
-    public static String CameraIp;
     EditText CameraIP, ControlIP, Port;
     LinearLayout Button_go;
     LinearLayout Button_set;

src/app/src/main/java/wificar/MyVideo.java

@@ -65,10 +65,7 @@ public class MyVideo extends Activity {
         Log.d("wifirobot", "control is :++++" + CtrlIp);
         Log.d("wifirobot", "CtrlPort is :++++" + CtrlPort);
         r.GetCameraIP(CameraIp);
-        InitSocket();
+
-        rockerView = new RockerView(this,socketWriter,this.getApplicationContext(),null);
-        RelativeLayout.LayoutParams params = new RelativeLayout.LayoutParams(1000,1000);
-        addContentView(rockerView,params);
         TakePhotos.setOnClickListener(arg0 -> {
             // TODO Auto-generated method stub
             if (null != Constant.handler) {
@@ -86,6 +83,7 @@ public class MyVideo extends Activity {
             MyVideo.this.startActivity(intent1);
 
         });
+        new Thread(()->InitSocket()).run();
     }
 
     public void InitSocket() {
@@ -105,6 +103,9 @@ public class MyVideo extends Activity {
             // TODO Auto-generated catch block
             e.printStackTrace();
         }
+        rockerView = new RockerView(this,socketWriter,this.getApplicationContext(),null);
+        RelativeLayout.LayoutParams params = new RelativeLayout.LayoutParams(1000,1000);
+        addContentView(rockerView,params);
         //Toast.makeText(this,"³õʼ»¯ÍøÂçʧ°Ü£¡"+e.getMessage(),Toast.LENGTH_LONG).show();
     }