tianzixuan/Doric
Archived
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Allow simulator input ip address

Browse Source
This commit is contained in:
pengfei.zhou 2022-07-14 23:15:51 +08:00 committed by osborn
parent 179a95e2de
commit 271a70bc4b
2 changed files with 47 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doric-android/devkit/src/main/java/pub/doric/devkit/ui/DoricDevActivity.java
View File

@ -171,9 +171,6 @@ public class DoricDevActivity extends AppCompatActivity implements DoricDev.Stat
tvInput.setOnClickListener(new View.OnClickListener() { tvInput.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View clickView) { public void onClick(View clickView) {
if (DoricDev.getInstance().isRunningInEmulator) {
DoricDev.getInstance().connectDevKit("ws://" + "10.0.2.2" + ":7777");
} else {
AlertDialog.Builder builder = new AlertDialog.Builder(DoricDevActivity.this, R.style.Theme_Doric_Modal_Prompt); AlertDialog.Builder builder = new AlertDialog.Builder(DoricDevActivity.this, R.style.Theme_Doric_Modal_Prompt);
builder.setTitle("Please input devkit ip"); builder.setTitle("Please input devkit ip");
View v = LayoutInflater.from(DoricDevActivity.this).inflate(R.layout.doric_modal_prompt, null); View v = LayoutInflater.from(DoricDevActivity.this).inflate(R.layout.doric_modal_prompt, null);
@ -200,7 +197,6 @@ public class DoricDevActivity extends AppCompatActivity implements DoricDev.Stat
}); });
builder.show(); builder.show();
} }
}
}); });
tvDisconnect.setOnClickListener(new View.OnClickListener() { tvDisconnect.setOnClickListener(new View.OnClickListener() {
@Override @Override

6
doric-iOS/Devkit/Classes/DoricDevViewController.m
View File

@ -302,11 +302,6 @@ - (void)disconnect {
} }
- (void)input { - (void)input {
if (self.isSimulator) {
NSString *result = @"127.0.0.1";
[[DoricDev instance] connectDevKit:[NSString stringWithFormat:@"ws://%@:7777", result]];
ShowToast([NSString stringWithFormat:@"Connecting to %@", result], DoricGravityBottom);
} else {
UIAlertController *alert = [UIAlertController alertControllerWithTitle:@"Please input devkit ip" UIAlertController *alert = [UIAlertController alertControllerWithTitle:@"Please input devkit ip"
message:@"" message:@""
preferredStyle:UIAlertControllerStyleAlert]; preferredStyle:UIAlertControllerStyleAlert];
@ -333,7 +328,6 @@ - (void)input {
[alert addAction:okAction]; [alert addAction:okAction];
[self presentViewController:alert animated:YES completion:nil]; [self presentViewController:alert animated:YES completion:nil];
}
} }
- (void)scan { - (void)scan {