Merge branch 'master' into live_sdk
# Conflicts: # app/src/main/AndroidManifest.xml # app/src/main/java/com/mogo/cloud/MainActivity.java # modules/mogo-realtime/src/main/java/com/mogo/realtime/socket/SocketHandler.java
This commit is contained in:
@@ -15,6 +15,7 @@ import com.mogo.cloud.passport.MoGoAiCloudClient;
|
||||
public class MainActivity extends AppCompatActivity {
|
||||
|
||||
private Button btnJumpPassPort;
|
||||
private Button btnJumpConfigInfo;
|
||||
private Button btnJumpNetWorkPort;
|
||||
private Button btnJumpRealTime;
|
||||
private Button btnJumpRoadCondition;
|
||||
@@ -59,6 +60,12 @@ public class MainActivity extends AppCompatActivity {
|
||||
startActivity(intent);
|
||||
});
|
||||
|
||||
btnJumpConfigInfo = findViewById(R.id.btnJumpConfigInfo);
|
||||
btnJumpConfigInfo.setOnClickListener(v -> {
|
||||
Intent intent = new Intent(MainActivity.this, ConfigInfoActivity.class);
|
||||
startActivity(intent);
|
||||
});
|
||||
|
||||
btnJumpLivePush = findViewById(R.id.btnJumpLivePush);
|
||||
btnJumpLivePush.setOnClickListener(v -> {
|
||||
Intent intent = new Intent(MainActivity.this, LivePushActivity.class);
|
||||
|
||||
Reference in New Issue
Block a user