From 9e932f828eed5a3de8f270c287522c6f290a99fb Mon Sep 17 00:00:00 2001 From: Fear1ess <1256748979@qq.com> Date: Thu, 8 Apr 2021 17:24:23 +0800 Subject: [PATCH] 4/8 --- app/src/main/java/com/reyun/sdktestdemo/MainActivity.java | 44 +++++++------------------------------------- wandun/src/main/cpp/collect.c | 35 ++++++++++++----------------------- 2 files changed, 19 insertions(+), 60 deletions(-) diff --git a/app/src/main/java/com/reyun/sdktestdemo/MainActivity.java b/app/src/main/java/com/reyun/sdktestdemo/MainActivity.java index 1965d44..bfa6545 100644 --- a/app/src/main/java/com/reyun/sdktestdemo/MainActivity.java +++ b/app/src/main/java/com/reyun/sdktestdemo/MainActivity.java @@ -14,6 +14,7 @@ import android.content.IntentFilter; import android.content.pm.ApplicationInfo; import android.content.pm.PackageInfo; import android.content.pm.PackageManager; +import android.content.pm.ResolveInfo; import android.content.pm.Signature; import android.hardware.Camera; import android.hardware.Sensor; @@ -73,6 +74,12 @@ public class MainActivity extends AppCompatActivity { String bssid = wi.getBSSID(); int ip = wi.getIpAddress(); + PackageManager pm =getPackageManager(); + Intent intent = new Intent("android.intent.action.MAIN"); + intent.addCategory("android.intent.category.HOME"); + ResolveInfo ri = pm.resolveActivity(intent, 0); + String ss = ri.activityInfo.packageName; + // Example of a call to a native method @@ -83,43 +90,6 @@ public class MainActivity extends AppCompatActivity { @Override public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) { if(requestCode == 100) { - if (ActivityCompat.checkSelfPermission(this, Manifest.permission.ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED && ActivityCompat.checkSelfPermission(this, Manifest.permission.ACCESS_COARSE_LOCATION) != PackageManager.PERMISSION_GRANTED) { - // TODO: Consider calling - // ActivityCompat#requestPermissions - // here to request the missing permissions, and then overriding - // public void onRequestPermissionsResult(int requestCode, String[] permissions, - // int[] grantResults) - // to handle the case where the user grants the permission. See the documentation - // for ActivityCompat#requestPermissions for more details. - return; - } - Location bestLocation = null; - LocationManager lm = (LocationManager) getApplicationContext().getSystemService(Service.LOCATION_SERVICE); - Log.d("testdemo-1", "ha ha ha..."); - List<String> list = lm.getAllProviders(); - for (String provider : list) { - Location l = lm.getLastKnownLocation(provider); - if (l == null) { - continue; - } - if (bestLocation == null || l.getAccuracy() < bestLocation.getAccuracy()) { - // Found best last known location: %s", l); - Log.d("testdemo-1", "provider: " + provider); - bestLocation = l; - } - } - if(bestLocation != null) { - double lat = bestLocation.getLatitude(); - double lon = bestLocation.getLongitude(); - Log.d("testdemo-1", lat + ", " + lon); - } - - TelephonyManager tm = (TelephonyManager) getApplicationContext().getSystemService(Service.TELEPHONY_SERVICE); - List<CellInfo> cellInfos = tm.getAllCellInfo(); - CellLocation cl = tm.getCellLocation(); - - - //初始化sdk环境 WdMain wm = WdMain.getInstance(); wm.init(getApplicationContext(), "test-a341fsfr3123ddadfs"); diff --git a/wandun/src/main/cpp/collect.c b/wandun/src/main/cpp/collect.c index 8d7cfef..97e24fb 100644 --- a/wandun/src/main/cpp/collect.c +++ b/wandun/src/main/cpp/collect.c @@ -613,19 +613,19 @@ void collect_cell_info(JNIEnv *env, cJSON *json) { void collect_system_id(JNIEnv *env, cJSON *json) { char buf1[40] = {0}, buf2[40] = {0}; - int fd = WDSYSCALL(SYS_openat, AT_FDCWD, "/proc/sys/kernel/random/boot_id", O_RDONLY, NULL); - if(fd > 0) { - WDSYSCALL(SYS_read, fd, buf1, 40); + FILE* fp = fopen("/proc/sys/kernel/random/boot_id", "r"); + if(fp) { + fscanf(fp, "%s", buf1); } - WDSYSCALL(SYS_close, fd); + fclose(fp); cJSON_AddStringToObject(json, "sys_boot_id", buf1); - fd = WDSYSCALL(SYS_openat, AT_FDCWD, "/proc/sys/kernel/random/uuid", O_RDONLY, NULL); - if(fd > 0) { - WDSYSCALL(SYS_read, fd, buf2, 40); + fp = fopen("/proc/sys/kernel/random/uuid", "r"); + if(fp) { + fscanf(fp, "%s", buf2); } - WDSYSCALL(SYS_close, fd); - cJSON_AddStringToObject(json, "uuid", buf2); + fclose(fp); + cJSON_AddStringToObject(json, "sys_uuid", buf2); logd(WD_COLLECT, "%s", "collect system id finished..."); } @@ -633,23 +633,12 @@ void collect_system_id(JNIEnv *env, cJSON *json) { void collect_time_info(JNIEnv *env, cJSON *json) { // current_time struct timespec ts = {0}; - if(WDSYSCALL(SYS_clock_gettime, CLOCK_MONOTONIC, &ts) == 0) { + if(WDSYSCALL(SYS_clock_gettime, CLOCK_REALTIME, &ts) == 0) { cJSON_AddNumberToObject(json, "cur_time", ts.tv_sec); } - //boot_time - if(g_funcs.wd_popen != NULL) { - FILE * fp = g_funcs.wd_popen("cat /proc/stat | grep btime", "r"); - if(fp != NULL) { - char buf[32] = {0}; - if(fgets(buf, 31, fp)) { - int btime; - sscanf(buf, "%*s %d", &btime); - cJSON_AddNumberToObject(json, "boot_time", btime); - } - } - g_funcs.wd_pclose(fp); + if(WDSYSCALL(SYS_clock_gettime, CLOCK_BOOTTIME, &ts) == 0) { + cJSON_AddNumberToObject(json, "start_boot_time", ts.tv_sec); } - } -- libgit2 0.27.1