Skip to content

Commit

Permalink
remove useless call
Browse files Browse the repository at this point in the history
  • Loading branch information
@codeskyblue
codeskyblue committed Sep 23, 2019
1 parent dc66abc commit 2924859
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 94 deletions.
3 changes: 2 additions & 1 deletion app/src/main/AndroidManifest.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,9 @@
<intent-filter android:priority="10000">
<action android:name="com.github.uiautomator.ACTION_START" />
<action android:name="com.github.uiautomator.ACTION_STOP" />
<action android:name="android.intent.action.MAIN" />

<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</service>

Expand Down
20 changes: 0 additions & 20 deletions app/src/main/java/com/github/uiautomator/MainActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,22 +68,6 @@ public class MainActivity extends Activity {
private boolean isWindowShown = false;
private FloatView floatView;

private ServiceConnection connection = new ServiceConnection() {
@Override
public void onServiceConnected(ComponentName componentName, IBinder iBinder) {
Log.i(TAG, "service connected");
}

@Override
public void onServiceDisconnected(ComponentName componentName) {
Log.i(TAG, "service disconnected");

// restart service
Intent intent = new Intent(MainActivity.this, Service.class);
startService(intent);
}
};

private Handler handler = new Handler() {
public void handleMessage(Message msg) {
Log.d(TAG, "message what " + msg.what);
Expand All @@ -109,9 +93,6 @@ protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_main);

Intent serviceIntent = new Intent(this, Service.class);
bindService(serviceIntent, connection, BIND_IMPORTANT | BIND_AUTO_CREATE);

tvAgentStatus = findViewById(R.id.atx_agent_status);

Button btnFinish = findViewById(R.id.btn_finish);
Expand Down Expand Up @@ -375,7 +356,6 @@ protected void onDestroy() {
super.onDestroy();
// must unbind service, otherwise it will leak memory
// connection no need to set it to null
unbindService(connection);
Log.i(TAG, "unbind service");
}
}
50 changes: 3 additions & 47 deletions app/src/main/java/com/github/uiautomator/Service.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
import okhttp3.Callback;
import okhttp3.Response;

public class Service extends IntentService {
public class Service extends android.app.Service {
public static final String ACTION_START = "com.github.uiautomator.ACTION_START";
public static final String ACTION_STOP = "com.github.uiautomator.ACTION_STOP";

Expand All @@ -43,58 +43,13 @@ public class Service extends IntentService {
private NotificationCompat.Builder builder;
private List<AbstractMonitor> monitors = new ArrayList<>();

/**
* Creates an IntentService. Invoked by your subclass's constructor.
*/
public Service() {
super("MonitorService");
}

@Override
public IBinder onBind(Intent intent) {
// We don't support binding to this service
return null;
}

@Override
protected void onHandleIntent(@Nullable Intent intent) {
while (true) {
try {
Thread.sleep(10 * 1000);
final String url = "http://127.0.0.1:7912/ping";
OkhttpManager.getSingleton().post(url, new JSONObject().toString(), new Callback() {
@Override
public void onFailure(Call call, IOException e) {
WifiManager wifiManager = (WifiManager) Service.this.getApplicationContext().getSystemService(Context.WIFI_SERVICE);
int ip = wifiManager.getConnectionInfo().getIpAddress();
String ipStr = (ip & 0xFF) + "." + ((ip >> 8) & 0xFF) + "." + ((ip >> 16) & 0xFF) + "." + ((ip >> 24) & 0xFF);
String str = getString(R.string.monitor_service_text) + " on " + ipStr;
str += getString(R.string.agent_die);
setNotificationContentText(str);
Log.e(TAG, "call url:" + url + " is failed, and exception:" + e);
}

@Override
public void onResponse(Call call, Response response) throws IOException {
String result = response.body().string();
if (result.equals("pong")) {
WifiManager wifiManager = (WifiManager) Service.this.getApplicationContext().getSystemService(Context.WIFI_SERVICE);
int ip = wifiManager.getConnectionInfo().getIpAddress();
String ipStr = (ip & 0xFF) + "." + ((ip >> 8) & 0xFF) + "." + ((ip >> 16) & 0xFF) + "." + ((ip >> 24) & 0xFF);
String str = getString(R.string.monitor_service_text) + " on " + ipStr;
str += getString(R.string.agent_live);
setNotificationContentText(str);
}
Log.i(TAG, result);
}
});
} catch (InterruptedException e) {
e.printStackTrace();
Log.e(TAG, e.getMessage());
}
}
}

@RequiresApi(Build.VERSION_CODES.O)
private String createNotificationChannel(String channelId, String channelName) {
NotificationChannel chan = new NotificationChannel(channelId,
Expand Down Expand Up @@ -152,8 +107,9 @@ public void onDestroy() {

@Override
public int onStartCommand(Intent intent, int flags, int startId) {
Log.i(TAG, "On StartCommand");
super.onStartCommand(intent, flags, startId);

Log.i(TAG, "On StartCommand");
String action = intent.getAction();

if (ACTION_START.equals(action)) {
Expand Down
6 changes: 3 additions & 3 deletions app/src/main/res/values/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@

<string name="hello_world">Hello world!</string>
<string name="action_settings">Settings</string>
<string name="monitor_service_ticker">Monitor service is running</string>
<string name="monitor_service_title">UIAutomator Monitor</string>
<string name="monitor_service_text">Monitor service is running</string>
<string name="monitor_service_ticker">UIAutomator service started</string>
<string name="monitor_service_title">UIAutomator</string>
<string name="monitor_service_text">Stupid service</string>
<string name="agent_die">:agent is die</string>
<string name="agent_live">:agent is live</string>
<string name="fast_input_label">FastInputIME</string>
Expand Down
30 changes: 7 additions & 23 deletions permission/permission.iml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,20 +49,20 @@
<sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/shaders" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/shaders" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
Expand All @@ -88,36 +88,20 @@
<excludeFolder url="file://$MODULE_DIR$/build/generated/source/r" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/aapt_friendly_merged_manifests" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/annotation_processor_list" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/annotations_typedef_file" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/annotations_zip" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/check-manifest" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/check_manifest_result" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/compile_library_classes" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/compile_only_not_namespaced_r_class_jar" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/consumer_proguard_file" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/intermediate-jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javac" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/library_and_local_jars_jni" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/library_assets" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/library_java_res" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/library_manifest" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint_jar" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/merged_jni_libs" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/merged_manifests" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/merged_shaders" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/packaged-classes" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/packaged_res" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/public_res" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/runtime_library_classes" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shader_assets" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/tmp" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
Expand Down

0 comments on commit 2924859

Please sign in to comment.