X-Git-Url: http://47.100.26.94:8080/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fai%2Fsuanzi%2Frtmpclient%2FMainActivity.java;h=5779298d26f34fcbe9edc831d3b193b7efe5c5c8;hb=d1a43ff97228c10a4eaef604bd40eb8be3fcf8f6;hp=c257b9f97ffcb66b334e0efa1b98d0d954e1975a;hpb=a2555d7a8d228c91da9f8014ca4a09dbd0d050ae;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 c257b9f..5779298 100644
--- a/app/src/main/java/ai/suanzi/rtmpclient/MainActivity.java
+++ b/app/src/main/java/ai/suanzi/rtmpclient/MainActivity.java
@@ -41,6 +41,12 @@ 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;
+import android.view.ViewConfiguration;
+import java.lang.reflect.Field;
+import android.view.Menu;
+import android.view.MenuItem;
 
 public class MainActivity extends AppCompatActivity implements MyService.MyServiceEventListener, CameraView.Callback {
 
@@ -163,38 +169,34 @@ 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);
-//        //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();
-//        }
-
-        setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);//竖屏
-
-
-        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);
+    private class ScreenSize {
+        public ScreenSize(){ }
+        public int width = 0;
+        public int height = 0;
+    }
+
+    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;
 
+        return size;
+    }
+
+    private void initCameraView (){
 
+        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);
@@ -294,6 +296,12 @@ public class MainActivity extends AppCompatActivity implements MyService.MyServi
         }
     }
 
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        getMenuInflater().inflate(R.menu.main, menu);
+        return true;
+    }
+
     private String getMacAddr() {
         WifiManager manager = (WifiManager) getApplicationContext().getSystemService(Context.WIFI_SERVICE);
         WifiInfo info = manager.getConnectionInfo();
@@ -302,9 +310,8 @@ public class MainActivity extends AppCompatActivity implements MyService.MyServi
     }
 
     private boolean canStartService(){
-
         if(System.getProperty("os.arch").equals("i686")){
-            return  true;
+            return true;
         }
         return mUsbMonitor.hasUsbCamera() && NetworkMonitor.isNetworkAvailable(this);
     }
@@ -337,6 +344,26 @@ public class MainActivity extends AppCompatActivity implements MyService.MyServi
         }
     }
 
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item)
+    {
+        switch (item.getItemId()) {
+            case R.id.action_settings:
+                Toast.makeText(MainActivity.this, "setting", Toast.LENGTH_SHORT).show();
+                break;
+            case R.id.action_mail:
+                gLogger.debug("onOptionsItemSelected - send mail button clicked");
+                LogUtil.sendLogs();
+                break;
+            case R.id.action_about:
+                break;
+            case R.id.action_update:
+                gLogger.debug("onOptionsItemSelected - check update");
+                new CheckVersionInfoTask(this).execute();
+        }
+        return super.onOptionsItemSelected(item);
+    }
+
     private void restartApplication() {
         final Intent intent = getPackageManager().getLaunchIntentForPackage(getPackageName());
         intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
@@ -358,4 +385,18 @@ public class MainActivity extends AppCompatActivity implements MyService.MyServi
         }
         isFullScreen = !isFullScreen;
     }
+
+    private void getOverflowMenu() {
+
+        try {
+            ViewConfiguration config = ViewConfiguration.get(this);
+            Field menuKeyField = ViewConfiguration.class.getDeclaredField("sHasPermanentMenuKey");
+            if(menuKeyField != null) {
+                menuKeyField.setAccessible(true);
+                menuKeyField.setBoolean(config, false);
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
 }