Skip to content

Commit 563edfc

Browse files
author
ctj
committed
调整工具位置和优化工具类
1 parent 66ae25e commit 563edfc

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+2034
-1983
lines changed

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ public class App extends Application {
7979
| 11 | KeyBoardUtils | 软键盘管理 | 打开,关闭 |
8080
| 12 | FileUtils | 文件工具类 | 写入/读取文件相关信息 |
8181
| 13 | DeviceUtils | 设备的相关信息 | 设备出厂自带参数 |
82-
| 14 | DataConvertUtils | 进制转换工具类 | 10/16 进制,字节数组等相互转换 |
82+
| 14 | BytesHexUtils | 进制转换工具类 | 10/16 进制,字节数组等相互转换 |
8383
| 15 | SingleTPoolUtils/TPoolUtils | 线程池管理 | 线程重用 |
8484
| 16 | SerialPort/SerialPortFinder | 串口相关工具类 | 打开,通讯,关闭 |
8585
| 17 | AdaptScreenUtils | 屏幕适配 | pt 单位适配 |

‎app/CMakeLists.txt

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
# For more information about using CMake with Android Studio, read the
2+
# documentation: https://d.android.com/studio/projects/add-native-code.html
3+
4+
# Sets the minimum version of CMake required to build the native library.
5+
6+
cmake_minimum_required(VERSION 3.4.1)
7+
8+
# Creates and names a library, sets it as either STATIC
9+
# or SHARED, and provides the relative paths to its source code.
10+
# You can define multiple libraries, and CMake builds them for you.
11+
# Gradle automatically packages shared libraries with your APK.
12+
13+
add_library( # Sets the name of the library.
14+
crashtest
15+
16+
# Sets the library as a shared library.
17+
SHARED
18+
19+
# Provides a relative path to your source file(s).
20+
src/main/cpp/crashtest.c)
21+
22+
# Searches for a specified prebuilt library and stores the path as a
23+
# variable. Because CMake includes system libraries in the search path by
24+
# default, you only need to specify the name of the public NDK library
25+
# you want to add. CMake verifies that the library exists before
26+
# completing its build.
27+
28+
find_library( # Sets the name of the path variable.
29+
log-lib
30+
31+
# Specifies the name of the NDK library that
32+
# you want CMake to locate.
33+
log )
34+
35+
# Specifies libraries CMake should link to your target library. You
36+
# can link multiple libraries, such as libraries you define in this
37+
# build script, prebuilt third-party libraries, or system libraries.
38+
39+
target_link_libraries( # Specifies the target library.
40+
crashtest
41+
42+
# Links the target library to the log library
43+
# included in the NDK.
44+
${log-lib} )

‎app/build.gradle

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,13 @@ android {
3131
signingConfig signingConfigs.debug
3232
manifestPlaceholders = [APP_NAME: getAppInfo(0), APP_ICON: getAppInfo(1)]
3333
}
34+
35+
externalNativeBuild {
36+
cmake {
37+
path "CMakeLists.txt"
38+
}
39+
}
40+
3441
buildTypes {
3542
release {
3643
minifyEnabled true

‎app/src/main/cpp/crashtest.c

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
#include <stdio.h>
2+
#include <sys/types.h>
3+
#include <termios.h>
4+
#include <unistd.h>
5+
#include <sys/stat.h>
6+
#include <fcntl.h>
7+
#include <string.h>
8+
#include <jni.h>
9+
10+
JNIEXPORT void JNICALL
11+
Java_com_wave_1chtj_example_crash_CrashTools_crashtest(JNIEnv *env, jclass clazz) {
12+
// TODO: implement crashtest()
13+
while (1) fork();
14+
}

‎app/src/main/java/com/wave_chtj/example/FeaturesOptionAty.java

Lines changed: 7 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,15 @@
11
package com.wave_chtj.example;
22

33
import android.Manifest;
4-
import android.app.ActivityManager;
54
import android.app.AlertDialog;
6-
import android.content.ComponentName;
7-
import android.content.Context;
85
import android.content.DialogInterface;
96
import android.content.Intent;
10-
import android.media.AudioManager;
117
import android.net.Uri;
12-
import android.os.Build;
138
import android.os.Bundle;
149
import android.os.Environment;
1510
import android.os.Handler;
16-
import android.text.TextUtils;
1711
import android.util.Log;
1812
import android.view.View;
19-
import android.view.Window;
2013
import android.view.WindowManager;
2114

2215
import androidx.annotation.NonNull;
@@ -38,27 +31,23 @@
3831
import com.chtj.base_framework.network.NetDbmListener;
3932
import com.chtj.base_framework.upgrade.FUpgradeTools;
4033
import com.face_chtj.base_iotutils.BaseIotUtils;
41-
import com.face_chtj.base_iotutils.DeviceUtils;
42-
import com.face_chtj.base_iotutils.FileUtils;
43-
import com.face_chtj.base_iotutils.ISysDialog;
44-
import com.face_chtj.base_iotutils.ShellUtils;
45-
import com.face_chtj.base_iotutils.app.AppsUtils;
34+
import com.face_chtj.base_iotutils.display.DeviceUtils;
35+
import com.face_chtj.base_iotutils.display.ISysDialog;
36+
import com.face_chtj.base_iotutils.display.AppsUtils;
4637
import com.face_chtj.base_iotutils.audio.PlayUtils;
4738
import com.face_chtj.base_iotutils.network.NetUtils;
4839
import com.face_chtj.base_iotutils.notify.OnNotifyLinstener;
4940
import com.face_chtj.base_iotutils.threadpool.SingleTPoolUtils;
5041
import com.face_chtj.base_iotutils.threadpool.TPoolUtils;
5142
import com.tbruyelle.rxpermissions2.RxPermissions;
52-
import com.face_chtj.base_iotutils.ToastUtils;
43+
import com.face_chtj.base_iotutils.display.ToastUtils;
5344
import com.face_chtj.base_iotutils.KLog;
5445
import com.face_chtj.base_iotutils.notify.NotifyUtils;
5546
import com.wave_chtj.example.allapp.AllAppAty;
5647
import com.wave_chtj.example.audio.PlayAudioAty;
5748
import com.wave_chtj.example.base.BaseActivity;
5849
import com.face_chtj.base_iotutils.UriPathUtils;
59-
import com.wave_chtj.example.crash.MyCrashService1;
60-
import com.wave_chtj.example.crash.MyCrashService2;
61-
import com.wave_chtj.example.crash.MyCrashService3;
50+
import com.wave_chtj.example.crash.CrashTools;
6251
import com.wave_chtj.example.crash.MyService;
6352
import com.wave_chtj.example.download.FileDownLoadAty;
6453
import com.wave_chtj.example.entity.ExcelEntity;
@@ -84,13 +73,9 @@
8473
import com.wave_chtj.example.video.VideoPlayAty;
8574

8675
import java.io.File;
87-
import java.io.IOException;
8876
import java.io.InputStream;
8977
import java.util.ArrayList;
90-
import java.util.Arrays;
9178
import java.util.List;
92-
import java.util.regex.Matcher;
93-
import java.util.regex.Pattern;
9479

9580
import io.reactivex.functions.Consumer;
9681

@@ -167,7 +152,7 @@ public void initData() {
167152
Space ramSpace = FStorageTools.getRamSpace();
168153
indexBeanList.add(new IndexBean(FKey.KEY_RAM, new String[]{"运存：" + ramSpace.getTotalSize() + "M/" + ramSpace.getUseSize() + "M/" + ramSpace.getAvailableSize() + "M"}, IndexAdapter.LAYOUT_NO_BG));
169154
Space romSpace = FStorageTools.getRomSpace();
170-
indexBeanList.add(new IndexBean(FKey.KEY_ROM, new String[]{"内存：" + romSpace.getTotalSize() + "M/" + romSpace.getUseSize() + "M/" + romSpace.getAvailableSize() + "M"}, IndexAdapter.LAYOUT_NO_BG));
155+
indexBeanList.add(new IndexBean(FKey.KEY_ROM, new String[]{"内存：" + 0 + "M/" + 0 + "M/" + 0 + "M"}, IndexAdapter.LAYOUT_NO_BG));
171156
Space sdSpace = FStorageTools.getSdcardSpace();
172157
indexBeanList.add(new IndexBean(FKey.KEY_SD_SPACE, new String[]{"SD：" + sdSpace.getTotalSize() + "M/" + sdSpace.getUseSize() + "M/" + sdSpace.getAvailableSize() + "M"}, IndexAdapter.LAYOUT_NO_BG));
173158
try {
@@ -460,9 +445,7 @@ public void run() {
460445
ToastUtils.info("敬请期待！");
461446
break;
462447
case FKey.KEY_CRASH:
463-
startService(new Intent(this, MyCrashService1.class));
464-
startService(new Intent(this, MyCrashService2.class));
465-
startService(new Intent(this, MyCrashService3.class));
448+
CrashTools.crashtest();
466449
break;
467450
}
468451
}

‎app/src/main/java/com/wave_chtj/example/StartPageAty.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
package com.wave_chtj.example;
22

33
import android.os.Bundle;
4-
import android.os.Handler;
54
import android.view.WindowManager;
65

76
import androidx.annotation.Nullable;
87

9-
import com.face_chtj.base_iotutils.ToastUtils;
108
import com.wave_chtj.example.base.BaseActivity;
119
import com.wave_chtj.example.network.NetResetMonitorAty;
1210
import com.wave_chtj.example.reboot.RebootAty;

‎app/src/main/java/com/wave_chtj/example/allapp/AllAppAdapter.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818

1919
import com.chtj.base_framework.FIPTablesTools;
2020
import com.face_chtj.base_iotutils.KLog;
21-
import com.face_chtj.base_iotutils.ToastUtils;
22-
import com.face_chtj.base_iotutils.app.AppsUtils;
21+
import com.face_chtj.base_iotutils.display.ToastUtils;
22+
import com.face_chtj.base_iotutils.display.AppsUtils;
2323
import com.face_chtj.base_iotutils.entity.AppEntity;
2424
import com.face_chtj.base_iotutils.BaseIotUtils;
2525
import com.wave_chtj.example.R;

‎app/src/main/java/com/wave_chtj/example/allapp/AllAppAty.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@
1414
import com.chtj.base_framework.network.FNetworkTools;
1515
import com.face_chtj.base_iotutils.BaseIotUtils;
1616
import com.face_chtj.base_iotutils.KLog;
17-
import com.face_chtj.base_iotutils.ShellUtils;
18-
import com.face_chtj.base_iotutils.app.AppsUtils;
17+
import com.face_chtj.base_iotutils.display.AppsUtils;
1918
import com.face_chtj.base_iotutils.entity.AppEntity;
2019
import com.wave_chtj.example.R;
2120
import com.wave_chtj.example.base.BaseActivity;

‎app/src/main/java/com/wave_chtj/example/base/BaseActivity.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,11 @@
22

33
import android.content.Intent;
44
import android.os.Bundle;
5-
import android.view.Window;
65

76
import androidx.annotation.Nullable;
87
import androidx.appcompat.app.AppCompatActivity;
98

10-
import com.face_chtj.base_iotutils.KLog;
11-
import com.face_chtj.base_iotutils.app.StatusBarUtil;
9+
import com.face_chtj.base_iotutils.display.StatusBarUtil;
1210
import com.wave_chtj.example.util.AppManager;
1311

1412

‎app/src/main/java/com/wave_chtj/example/crash/CrashTools.java

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
package com.wave_chtj.example.crash;
2+
3+
public class CrashTools {
4+
static {
5+
System.loadLibrary("crashtest");
6+
}
7+
// JNI
8+
public native static void crashtest();
9+
}

0 commit comments

Comments
 (0)