X-Git-Url: http://47.100.26.94:8080/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fai%2Fsuanzi%2Frtmpclient%2FMainActivity.java;h=34132f195657a5efd88575aaebda3d9723290bb5;hb=3c832ad69b0475ee433b27eaf12f0ae7d7033d65;hp=c1beb4f09757a37374a7ca96f35deae07c06aae7;hpb=edf5b6603fc32ed012f765763db6fa03de3715e5;p=rtmpclient.git diff --git a/app/src/main/java/ai/suanzi/rtmpclient/MainActivity.java b/app/src/main/java/ai/suanzi/rtmpclient/MainActivity.java index c1beb4f..34132f1 100644 --- a/app/src/main/java/ai/suanzi/rtmpclient/MainActivity.java +++ b/app/src/main/java/ai/suanzi/rtmpclient/MainActivity.java @@ -2,6 +2,7 @@ package ai.suanzi.rtmpclient; import android.content.IntentFilter; import android.hardware.Camera; +import android.net.Uri; import android.support.design.widget.TextInputEditText; import android.support.v7.app.ActionBar; import android.support.v7.app.AppCompatActivity; @@ -31,15 +32,21 @@ import ai.suanzi.rtmpclient.MyService.LocalBinder; import android.os.IBinder; import android.net.ConnectivityManager; import android.view.ViewGroup; - -//"rtmp://gpussh.suanzi.ai:1935/myapp/suanzi_ac83f34ead90"; +import org.apache.http.impl.client.HttpClients; +import org.apache.http.impl.client.CloseableHttpClient; +import org.apache.http.client.methods.CloseableHttpResponse; + +//import org.apache.http.client.methods; +import android.view.MotionEvent; +import android.graphics.Color; +import android.os.Build; +import android.content.pm.ActivityInfo; +import android.view.Display; +import android.graphics.Point; public class MainActivity extends AppCompatActivity implements MyService.MyServiceEventListener, CameraView.Callback { - //private static final String TAG = "MainActivity"; private Logger gLogger; - - //private String mMacAddr = ""; private NetworkMonitor networkMonitor; private UsbMonitor mUsbMonitor; private ServiceHealthMonitor mServiceHealthMonitor; @@ -48,15 +55,11 @@ public class MainActivity extends AppCompatActivity implements MyService.MyServi boolean mBounded = false; MyService mServer; Intent mIntent; + private boolean isFullScreen = false; private CameraView mCameraView; private void init(){ - //UserInfo.setConfigPath(getExternalFilesDir(null) + File.separator + "config"); - //UserInfo.readConfig(getExternalFilesDir(null) + File.separator + "config", getMacAddr()); - - - //this.mMacAddr = getMacAddr(); mIntent = new Intent(this, MyService.class); mUsbMonitor = new UsbMonitor(new UsbMonitor.UsbListener() { @@ -139,9 +142,9 @@ public class MainActivity extends AppCompatActivity implements MyService.MyServi mServer.startPreview(mCameraView.getHolder()); Camera.Size cs = mServer.getBestPictureSize(); mCameraView.setLayout(cs.width, cs.height); + } else { + gLogger.error("onServiceConnected - setRtmpUrl failed"); } - - } }; @@ -162,24 +165,72 @@ public class MainActivity extends AppCompatActivity implements MyService.MyServi } } - private void initCameraView (){ - getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, WindowManager.LayoutParams.FLAG_FULLSCREEN); - requestWindowFeature(Window.FEATURE_NO_TITLE); - getWindow().setFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON, WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON); - ///setContentView(R.layout.activity_main); + private class ScreenSize { + public ScreenSize(){ } + public int width = 0; + public int height = 0; + } - ActionBar actionBar = getSupportActionBar(); - actionBar.hide(); + private ScreenSize getScreenSize(){ + ScreenSize size = new ScreenSize(); + WindowManager windowManager = (WindowManager) getSystemService(Context.WINDOW_SERVICE); + final Display display = windowManager.getDefaultDisplay(); + Point outPoint = new Point(); + if(Build.VERSION.SDK_INT >= 19) { + display.getRealSize(outPoint); // include navigation bar + } else { + display.getSize(outPoint); // exclude navigation bar + } + size.width = outPoint.x; + size.height = outPoint.y; - DisplayMetrics outMetrics = new DisplayMetrics(); - this.getWindowManager().getDefaultDisplay().getMetrics(outMetrics); + /*if(outPoint.y > outPoint.x) { + size.height = outPoint.y; + size.width = outPoint.x; + } else { + size.height = outPoint.x; + size.width = outPoint.y; + }*/ + return size; + } - CameraView.SCREEN_WIDTH = outMetrics.widthPixels; - CameraView.SCREEN_HEIGHT = outMetrics.heightPixels; + private void initCameraView (){ +// getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, WindowManager.LayoutParams.FLAG_FULLSCREEN); +// requestWindowFeature(Window.FEATURE_NO_TITLE); +// getWindow().setFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON, WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON); +// ///setContentView(R.layout.activity_main); +// //getWindow().setNavigationBarColor(Color.TRANSPARENT); +// +// View decorView = getWindow().getDecorView(); +// int uiOptions = View.SYSTEM_UI_FLAG_HIDE_NAVIGATION +// | View.SYSTEM_UI_FLAG_FULLSCREEN; +// decorView.setSystemUiVisibility(uiOptions); +// +// +// ActionBar actionBar = getSupportActionBar(); +// try { +// actionBar.hide(); +// }catch (NullPointerException e){ +// gLogger.error("initCameraView - " + e.getMessage()); +// e.printStackTrace(); +// } + + + +// DisplayMetrics outMetrics = new DisplayMetrics(); +// this.getWindowManager().getDefaultDisplay().getMetrics(outMetrics); +// +// CameraView.SCREEN_WIDTH = outMetrics.widthPixels; +// CameraView.SCREEN_HEIGHT = outMetrics.heightPixels; +// gLogger.debug("Screen size is w: " + CameraView.SCREEN_WIDTH + ", h: " + CameraView.SCREEN_HEIGHT); + + ScreenSize size = getScreenSize(); + + CameraView.SCREEN_WIDTH = size.width; + CameraView.SCREEN_HEIGHT = size.height; gLogger.debug("Screen size is w: " + CameraView.SCREEN_WIDTH + ", h: " + CameraView.SCREEN_HEIGHT); - mCameraView = new CameraView(getApplicationContext(), this); setContentView(R.layout.activity_main); @@ -190,14 +241,14 @@ public class MainActivity extends AppCompatActivity implements MyService.MyServi @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - LogUtil.config(getExternalFilesDir(null)); + LogUtil.config(this); gLogger = Logger.getLogger(getClass()); - gLogger.error("#######################################"); + gLogger.error("onCreate ---------> "); UserInfo.readConfig(getExternalFilesDir(null) + File.separator + "config", getMacAddr()); initCameraView(); init(); - if(NetworkMonitor.isNetworkAvailable(this) && mUsbMonitor.hasUsbCamera()){ + if(canStartService()){ gLogger.error("Current network is available"); doBindService(); } else { @@ -209,18 +260,21 @@ public class MainActivity extends AppCompatActivity implements MyService.MyServi mServiceHealthMonitor.start(); } ////////// LogUtil.sendLogs(); /// Log test + //LogUtil.sendLogs(); + // test + //new CheckVersionInfoTask(MainActivity.this).execute(); } @Override protected void onPause(){ super.onPause(); - gLogger.error("OnPause --------->"); + gLogger.debug("OnPause --------->"); } @Override protected void onResume() { super.onResume(); - gLogger.error("OnResume ---------> "); + gLogger.debug("OnResume ---------> "); } @Override @@ -252,13 +306,29 @@ public class MainActivity extends AppCompatActivity implements MyService.MyServi @Override public void onBackPressed() { - gLogger.error("onBackPressed --------->"); + gLogger.debug("onBackPressed --------->"); Intent intent = new Intent(Intent.ACTION_MAIN); intent.addCategory(Intent.CATEGORY_HOME); intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); startActivity(intent); } + @Override + public boolean onTouchEvent(MotionEvent event) { + if(event.getAction() == MotionEvent.ACTION_UP) { + toggleFullScreen(); + } + return super.onTouchEvent(event); + } + + @Override + public void onWindowFocusChanged(boolean hasFocus) { + super.onWindowFocusChanged(hasFocus); + if (hasFocus && Build.VERSION.SDK_INT >= 19) { + toggleFullScreen(); + } + } + private String getMacAddr() { WifiManager manager = (WifiManager) getApplicationContext().getSystemService(Context.WIFI_SERVICE); WifiInfo info = manager.getConnectionInfo(); @@ -267,6 +337,10 @@ public class MainActivity extends AppCompatActivity implements MyService.MyServi } private boolean canStartService(){ + + if(System.getProperty("os.arch").equals("i686")){ + return true; + } return mUsbMonitor.hasUsbCamera() && NetworkMonitor.isNetworkAvailable(this); } @@ -303,4 +377,20 @@ public class MainActivity extends AppCompatActivity implements MyService.MyServi intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP); startActivity(intent); } + + private void toggleFullScreen (){ + View decorView = getWindow().getDecorView(); + if(!isFullScreen) { + decorView.setSystemUiVisibility( + View.SYSTEM_UI_FLAG_LAYOUT_STABLE + | View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION + | View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN + | View.SYSTEM_UI_FLAG_HIDE_NAVIGATION + | View.SYSTEM_UI_FLAG_FULLSCREEN + | View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY); + } else { + decorView.setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_STABLE | View.SYSTEM_UI_FLAG_VISIBLE); + } + isFullScreen = !isFullScreen; + } }