From: Peng Li Date: Thu, 17 May 2018 21:01:33 +0000 (+0800) Subject: Add statup when boot X-Git-Tag: v0.2.0^2 X-Git-Url: http://47.100.26.94:8080/?a=commitdiff_plain;h=effab912d57394ec776ffc03d6c969866c70cdf9;hp=-c;p=rtmpclient.git Add statup when boot --- effab912d57394ec776ffc03d6c969866c70cdf9 diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 4baf398..b255af6 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -9,6 +9,12 @@ android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/AppTheme"> + + + + + + @@ -32,4 +38,5 @@ - \ No newline at end of file + + diff --git a/app/src/main/java/ai/suanzi/rtmpclient/BootBroadcastReceiver.java b/app/src/main/java/ai/suanzi/rtmpclient/BootBroadcastReceiver.java new file mode 100644 index 0000000..1ee4ec7 --- /dev/null +++ b/app/src/main/java/ai/suanzi/rtmpclient/BootBroadcastReceiver.java @@ -0,0 +1,17 @@ +package ai.suanzi.rtmpclient; + +import android.content.BroadcastReceiver; +import android.content.Context; +import android.content.Intent; +import android.util.Log; + +public class BootBroadcastReceiver extends BroadcastReceiver { + @Override + public void onReceive(Context context, Intent intent) { + + Log.e("BootBroadcastReceiver", "onReceive"); + Intent mBootIntent = new Intent(context, MainActivity.class); + mBootIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); + context.startActivity(mBootIntent); + } +} diff --git a/app/src/main/java/ai/suanzi/rtmpclient/MainActivity.java b/app/src/main/java/ai/suanzi/rtmpclient/MainActivity.java index 708ed3c..4886501 100644 --- a/app/src/main/java/ai/suanzi/rtmpclient/MainActivity.java +++ b/app/src/main/java/ai/suanzi/rtmpclient/MainActivity.java @@ -238,7 +238,8 @@ public class MainActivity extends AppCompatActivity implements SurfaceHolder.Cal private void loadConfig() { UserInfo info = UserInfo.getConfig(); - mTextServer.setText(info.server); + 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; diff --git a/app/src/main/java/ai/suanzi/rtmpclient/UserInfo.java b/app/src/main/java/ai/suanzi/rtmpclient/UserInfo.java index ebac937..9d95894 100644 --- a/app/src/main/java/ai/suanzi/rtmpclient/UserInfo.java +++ b/app/src/main/java/ai/suanzi/rtmpclient/UserInfo.java @@ -136,4 +136,12 @@ public class UserInfo { //rtmp://gpussh.suanzi.ai:1935/myapp/suanzi_ac83f34ead90_cameraid return server + "/" + user + "_" + macAddr + "_" + cameraId; } + + public String getValue(String key){ + if(key.equals("server")) return server; + if(key.equals("user")) return user; + if(key.equals("macAddr")) return macAddr; + if(key.equals("cameraId")) return cameraId; + return ""; + } }