X-Git-Url: http://47.100.26.94:8080/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fai%2Fsuanzi%2Frtmpclient%2FMainActivity.java;h=c257b9f97ffcb66b334e0efa1b98d0d954e1975a;hb=a2555d7a8d228c91da9f8014ca4a09dbd0d050ae;hp=a0b4cc1a12877d47c3090d910345b1af8a95abc5;hpb=390f2fc2d835c37fb5c078fea795ae28cffc088e;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 a0b4cc1..c257b9f 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,19 @@ import ai.suanzi.rtmpclient.MyService.LocalBinder;
 import android.os.IBinder;
 import android.net.ConnectivityManager;
 import android.view.ViewGroup;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.client.methods.CloseableHttpResponse;
 
-//"rtmp://gpussh.suanzi.ai:1935/myapp/suanzi_ac83f34ead90";
+//import org.apache.http.client.methods;
+import android.view.MotionEvent;
+import android.graphics.Color;
+import android.os.Build;
+import android.content.pm.ActivityInfo;
 
 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,14 +53,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(){
-        // set config file
-        UserInfo.setConfigPath(getExternalFilesDir(null) + File.separator + "config");
-
-        this.mMacAddr = getMacAddr();
 
         mIntent = new Intent(this, MyService.class);
         mUsbMonitor = new UsbMonitor(new UsbMonitor.UsbListener() {
@@ -134,13 +136,13 @@ public class MainActivity extends AppCompatActivity implements MyService.MyServi
             LocalBinder mLocalBinder = (LocalBinder)service;
             mServer = mLocalBinder.getServiceInstance();
             mServer.setServiceEventListener(MainActivity.this);
-            if(mServer.setRtmpUrl(UserInfo.getConfig().toUrl(mMacAddr))){
+            if(mServer.setRtmpUrl(UserInfo.toUrl())){
                 mServer.startPreview(mCameraView.getHolder());
                 Camera.Size cs = mServer.getBestPictureSize();
                 mCameraView.setLayout(cs.width, cs.height);
+            } else {
+                gLogger.error("onServiceConnected - setRtmpUrl failed");
             }
-
-
         }
     };
 
@@ -162,13 +164,28 @@ 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().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);//竖屏
 
-        ActionBar actionBar = getSupportActionBar();
-        actionBar.hide();
 
         DisplayMetrics outMetrics = new DisplayMetrics();
         this.getWindowManager().getDefaultDisplay().getMetrics(outMetrics);
@@ -189,16 +206,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("#######################################");
-        //configLog();
+        gLogger.error("onCreate ---------> ");
+        UserInfo.readConfig(getExternalFilesDir(null) + File.separator + "config", getMacAddr());
         initCameraView();
         init();
-        loadConfig();
-
 
-        if(NetworkMonitor.isNetworkAvailable(this) && mUsbMonitor.hasUsbCamera()){
+        if(canStartService()){
             gLogger.error("Current network is available");
             doBindService();
         } else {
@@ -209,18 +224,22 @@ public class MainActivity extends AppCompatActivity implements MyService.MyServi
             gLogger.debug("mServiceHealthMonitor start, interval " + INTERVAL);
             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 +271,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();
@@ -266,27 +301,11 @@ public class MainActivity extends AppCompatActivity implements MyService.MyServi
         return info.getMacAddress().replace(":", ""); //02:00:00:00:00:00 - 020000000000
     }
 
-    private void loadConfig() {
-//        UserInfo info = UserInfo.getConfig();
-//        gLogger.error("server is:" + info.server);
-//        mTextServer.setText(info.server.equals("") ? "rtmp://gpussh.suanzi.ai:1935/myapp" : info.server);
-//        mTextUser.setText(info.user);
-//        //mMacAddr = info.macAddr.equals("") ?  this.mMacAddr : info.macAddr;
-//        gLogger.error("loadConfig - url is :" + info.toUrl(mMacAddr));
-    }
+    private boolean canStartService(){
 
-    private void saveConfig() {
-        UserInfo info = UserInfo.getConfig();
-        //info.update(mTextServer.getText().toString(), mTextUser.getText().toString(), mMacAddr, mTextCamera.getText().toString());
-        if(info.saveConfig()) {
-            Toast.makeText(getApplicationContext(), "Config saved", Toast.LENGTH_LONG).show();
-        } else {
-            Toast.makeText(getApplicationContext(), "Error: config saved", Toast.LENGTH_LONG).show();
+        if(System.getProperty("os.arch").equals("i686")){
+            return  true;
         }
-        gLogger.error("saveConfig - url: " + info.toUrl(mMacAddr));
-    }
-
-    private boolean canStartService(){
         return mUsbMonitor.hasUsbCamera() && NetworkMonitor.isNetworkAvailable(this);
     }
 
@@ -323,4 +342,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;
+    }
 }