X-Git-Url: http://47.100.26.94:8080/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fai%2Fsuanzi%2Frtmpclient%2FMainActivity.java;h=33ac4a62dc6c6e71146add80621cf6cb87494f6e;hb=eed83fe1fd361c6eb64152e02c0f05d203d071f9;hp=16322c6e0340a94a51d6749d858741ae470e9d67;hpb=0cbf18f82e25a7ba5d7eaab0411595c3efd41030;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 16322c6..33ac4a6 100644 --- a/app/src/main/java/ai/suanzi/rtmpclient/MainActivity.java +++ b/app/src/main/java/ai/suanzi/rtmpclient/MainActivity.java @@ -1,13 +1,19 @@ 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; import android.os.Bundle; +import android.util.DisplayMetrics; import android.util.Log; import android.view.SurfaceHolder; import android.view.SurfaceView; import android.view.View; +import android.view.Window; +import android.view.WindowManager; import android.widget.Button; import android.widget.Toast; import android.content.Context; @@ -25,21 +31,11 @@ import android.content.ComponentName; 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"; +public class MainActivity extends AppCompatActivity implements MyService.MyServiceEventListener, CameraView.Callback { -public class MainActivity extends AppCompatActivity implements SurfaceHolder.Callback, MyService.MyServiceEventListener{ - - private static final String TAG = "MainActivity"; private Logger gLogger; - - private SurfaceHolder mHolder; - private SurfaceView mSufaceView; - private Button mBtnStart; - private TextInputEditText mTextServer; - private TextInputEditText mTextUser; - private TextInputEditText mTextCamera; - private String mMacAddr = ""; private NetworkMonitor networkMonitor; private UsbMonitor mUsbMonitor; private ServiceHealthMonitor mServiceHealthMonitor; @@ -49,36 +45,9 @@ public class MainActivity extends AppCompatActivity implements SurfaceHolder.Cal MyService mServer; Intent mIntent; - private void configLog(){ - try { - final LogConfigurator logConfigurator = new LogConfigurator(); - String fname = getExternalFilesDir(null) + File.separator + "log.txt"; - logConfigurator.setFileName(fname); - Log.e(TAG, "Log file is located at: " + fname); - logConfigurator.setRootLevel(Level.DEBUG); - logConfigurator.setLevel("org.apache", Level.ERROR); - logConfigurator.setMaxFileSize(1024 * 1024 * 10); - logConfigurator.configure(); - gLogger = Logger.getLogger(getClass()); - } catch (Exception e){ - e.printStackTrace(); - } - } + private CameraView mCameraView; private void init(){ - configLog(); - gLogger.debug("#######################################"); - // set config file - UserInfo.setConfigPath(getExternalFilesDir(null) + File.separator + "config"); - - this.mMacAddr = getMacAddr(); - mBtnStart = findViewById(R.id.button); - mTextServer = findViewById(R.id.textServer); - mTextUser = findViewById(R.id.textUser); - mTextCamera = findViewById(R.id.textCamera); - mSufaceView = findViewById(R.id.surfaceView); - mHolder = mSufaceView.getHolder(); - mHolder.addCallback(this); mIntent = new Intent(this, MyService.class); mUsbMonitor = new UsbMonitor(new UsbMonitor.UsbListener() { @@ -134,10 +103,9 @@ public class MainActivity extends AppCompatActivity implements SurfaceHolder.Cal gLogger.error("onNotHealthy, in " + INTERVAL + " seconds, the publishing may stopped or have error "); doUnbindService(); doBindService(); - //restartApplication(); } }); - mServiceHealthMonitor.setInterval(INTERVAL); // 5 minutes + mServiceHealthMonitor.setInterval(INTERVAL); } @@ -158,8 +126,10 @@ public class MainActivity extends AppCompatActivity implements SurfaceHolder.Cal LocalBinder mLocalBinder = (LocalBinder)service; mServer = mLocalBinder.getServiceInstance(); mServer.setServiceEventListener(MainActivity.this); - if(mServer.setRtmpUrl(UserInfo.getConfig().toUrl(mMacAddr))){ - mServer.startPreview(mHolder); + if(mServer.setRtmpUrl(UserInfo.toUrl())){ + mServer.startPreview(mCameraView.getHolder()); + Camera.Size cs = mServer.getBestPictureSize(); + mCameraView.setLayout(cs.width, cs.height); } @@ -183,36 +153,56 @@ public class MainActivity extends AppCompatActivity implements SurfaceHolder.Cal } } + 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); + + ActionBar actionBar = getSupportActionBar(); + actionBar.hide(); + + 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); + + + + mCameraView = new CameraView(getApplicationContext(), this); + setContentView(R.layout.activity_main); + + ViewGroup.LayoutParams lp = new ViewGroup.LayoutParams(640, 480); + addContentView(mCameraView, lp); + //setContentView(mCameraView); + } @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - setContentView(R.layout.activity_main); - + LogUtil.config(this); + gLogger = Logger.getLogger(getClass()); + 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 { gLogger.error("Current network NOT available or no USB Camera connected"); } - mBtnStart.setText("start"); - mBtnStart.setOnClickListener(new View.OnClickListener(){ - @Override - public void onClick(View view){ - gLogger.error("----------> onClick"); - saveConfig(); - doUnbindService(); - doBindService(); - } - }); - if(!mServiceHealthMonitor.isAlive()) { gLogger.debug("mServiceHealthMonitor start, interval " + INTERVAL); mServiceHealthMonitor.start(); } + ////////// LogUtil.sendLogs(); /// Log test + //LogUtil.sendLogs(); + + new CheckVersionInfoTask(MainActivity.this).execute(); } @Override @@ -263,53 +253,18 @@ public class MainActivity extends AppCompatActivity implements SurfaceHolder.Cal startActivity(intent); } - // SurfaceHolder.Callback implementation - @Override - public void surfaceCreated(final SurfaceHolder holder){ - gLogger.error("SurfacedCreated"); - } - - @Override - public void surfaceChanged(SurfaceHolder holder, int format, int widht, int height){ - gLogger.error("surfaceChanged"); - mHolder = holder; - if (mServer != null) { - mServer.startPreview(holder); - } - } - - @Override - public void surfaceDestroyed(SurfaceHolder holder){ gLogger.debug("surfaceDestroyed"); - } - private String getMacAddr() { WifiManager manager = (WifiManager) getApplicationContext().getSystemService(Context.WIFI_SERVICE); WifiInfo info = manager.getConnectionInfo(); + gLogger.debug("Mac Address is " + info.getMacAddress()); 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); - mTextCamera.setText(info.cameraId); - //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); } @@ -317,22 +272,30 @@ public class MainActivity extends AppCompatActivity implements SurfaceHolder.Cal @Override public void onCameraError(String msg){ gLogger.error("onCameraEvent " + msg); - if(mUsbMonitor.hasUsbCamera()){ + //if(mUsbMonitor.hasUsbCamera()){ //mServer.reopenCamera(); - } + //} } @Override public void onEncoderError(String msg){ - gLogger.error("onEncoderEvent: " + msg); + gLogger.error("onEncoderError: " + msg); + doUnbindService(); + doBindService(); } @Override public void onPublishing(String msg){ - gLogger.error("onPublishing: " + msg); mServiceHealthMonitor.record(); } + @Override + public void onSurfaceChanged(SurfaceHolder holder, int format, int width, int height){ + if(mServer != null){ + mServer.startPreview(holder); + } + } + private void restartApplication() { final Intent intent = getPackageManager().getLaunchIntentForPackage(getPackageName()); intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);