hwf453
/
DYWOA
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1.1.9 release

Browse Source
master
hwf453 12 months ago
parent 13d5a9b813
commit 986f6afb04
12 changed files with 1846 additions and 128 deletions
Show Stats Download Patch File Download Diff File

4
app/build.gradle
Unescape Escape View File

@ -10,8 +10,8 @@ android {
applicationId "com.rehome.dywoa"
minSdk 24
targetSdk 35
versionCode 19
versionName "1.1.8"
versionCode 20
versionName "1.1.9"
multiDexEnabled true
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
//每个应用拥有不同的authorities，防止相同的在同一个手机上无法同时安装

4
app/src/main/AndroidManifest.xml
Unescape Escape View File

@ -220,6 +220,10 @@
android:name=".ui.activity.HightRiskActivity"
android:exported="false"
android:screenOrientation="portrait" />
<activity
android:name=".ui.activity.YhscpActivity"
android:exported="false"
android:screenOrientation="portrait" />
<activity
android:name=".ui.activity.FanWeiActivity"
android:exported="false"

6
app/src/main/java/com/rehome/dywoa/App.java
Unescape Escape View File

@ -72,9 +72,9 @@ public class App extends LitePalApplication {
* 初始化深信服注销监听回调
* 初始化深信服dp，sp转px的工具类
*/
initSdk(base);
GlobalListenerManager.getInstance().init(base);
DpPxSpTransformUtil.init(getResources().getDisplayMetrics().density);
// initSdk(base);
// GlobalListenerManager.getInstance().init(base);
// DpPxSpTransformUtil.init(getResources().getDisplayMetrics().density);
}
private void initUser() {

4
app/src/main/java/com/rehome/dywoa/ui/activity/FaceRecognitionAppActivity.java
Unescape Escape View File

@ -235,7 +235,7 @@ public class FaceRecognitionAppActivity extends BaseActivity {
@Override
public void run() {
openFrontCamera();
openBackCamera();
}
}, 1000);
@ -789,7 +789,7 @@ public class FaceRecognitionAppActivity extends BaseActivity {
super.onRequestPermissionsResult(requestCode, permissions, grantResults);
if (CAMERA_REQUEST_CODE == requestCode) {
if (grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
openFrontCamera();
openBackCamera();
} else {
//权限拒绝
Toast.makeText(this, "权限拒绝,无法开启摄像头,请手动设置开启APP访问摄像头权限", Toast.LENGTH_SHORT).show();

2
app/src/main/java/com/rehome/dywoa/ui/activity/HomeActivity.kt
Unescape Escape View File

@ -578,7 +578,7 @@ class HomeActivity : BaseActivityOaToolbarViewBinding<ActivityHomeBinding>() {
apkUrl(downloadURL)
apkName("智慧电厂.apk")
smallIcon(R.mipmap.ic_launcher)
showNewerToast(true)
showNewerToast(false)
apkVersionCode(versionCode.toInt())
apkVersionName(versionName)
apkDescription(description)

6
app/src/main/java/com/rehome/dywoa/ui/activity/LoginActivity.kt
Unescape Escape View File

@ -216,8 +216,8 @@ class LoginActivity : BaseActivityOaToolbarViewBinding<ActivityLoginBinding>() {
//瑞洪 RH00002/王总 RH00002/chao工 RH00003/范红波
binding.etUsername.setText("RH00002")
binding.etPassword.setText("A000000a.")
// binding.etUsername.setText("RH00002")
// binding.etPassword.setText("A000000a.")
// binding.etUsername.setText("RH00002")
// binding.etPassword.setText("A000000a.")
@ -538,7 +538,7 @@ class LoginActivity : BaseActivityOaToolbarViewBinding<ActivityLoginBinding>() {
apkUrl(downloadURL)
apkName("智慧电厂.apk")
smallIcon(R.mipmap.ic_launcher)
showNewerToast(true)
showNewerToast(false)
apkVersionCode(versionCode.toInt())
apkVersionName(versionName)
apkDescription(description)

1544
app/src/main/java/com/rehome/dywoa/ui/activity/YhscpActivity.java
View File

File diff suppressed because it is too large Load Diff

229
app/src/main/java/com/rehome/dywoa/ui/fragment/HomeFragment.java
Unescape Escape View File

@ -49,6 +49,7 @@ import com.rehome.dywoa.ui.activity.SisBaseActivity;
import com.rehome.dywoa.ui.activity.UseCarActivity;
import com.rehome.dywoa.ui.activity.UseSealActivity;
import com.rehome.dywoa.ui.activity.WaitForToDoActivity;
import com.rehome.dywoa.ui.activity.YhscpActivity;
import com.rehome.dywoa.ui.activity.YjyaActivity;
import com.rehome.dywoa.ui.activity.sbxdjgl.SbxdjglActivity;
import com.rehome.dywoa.ui.activity.sbxj.XscbglActivity;
@ -225,114 +226,6 @@ public class HomeFragment extends BaseFragment {
initData();
}
/**
* 创建一个ActivityResultLauncher
*
* @return
*/
private ActivityResultLauncher<Intent> createFaceRecognitionActivityResultLauncher() {
return registerForActivityResult(new ActivityResultContracts.StartActivityForResult(),
new ActivityResultCallback<ActivityResult>() {
@Override
public void onActivityResult(ActivityResult result) {
int resultCode = result.getResultCode();
if (resultCode == RESULT_OK) {
Intent resultIntent = result.getData();
//byte[] faceByte = resultIntent.getByteArrayExtra("FaceRecognition");
String faceTempPath = resultIntent.getStringExtra("FaceRecognitionPicPath");
File faceFile = new File(faceTempPath);
showLog(String.valueOf(faceFile.length()));
// String fileName = UUID.randomUUID().toString()+".png";
// File fileDir = new File(path);
// if(!fileDir.exists()){
// fileDir.mkdir();
// }
//
// String fileTempName = path + File.separator + fileName;
// showLog(fileTempName);
try {
// FileOutputStream fileOutputStream = new FileOutputStream(fileTempName);
// IoUtil.write(fileOutputStream,true,faceByte);
//File fileFaceUpToServer = new File(fileTempName);
//showLog(String.valueOf(fileFaceUpToServer.length()));
//String url = "http://192.168.2.115:8601/"+Contans.FACE_RECOGNITION_APP_URL;
String url = Contans.IP+Contans.FACE_RECOGNITION_APP_URL;
Request<String> request = NoHttp.createStringRequest(url, RequestMethod.POST);
// showLog(json);
// request.setDefineRequestBodyForJson(json);
request.add("face", faceFile);
NohttpUtils.getInstance().add(mActivity,30,request,new HttpListener<String>(){
@Override
public void onSucceed(int what, Response<String> response) throws ParseException {
String jsonResult = response.get();
showLog("-----face------");
showLog(jsonResult);
FaceRecognitionResult faceRecognitionResult = GsonUtils.GsonToBean(jsonResult,FaceRecognitionResult.class);
if(faceRecognitionResult!=null){
if(faceRecognitionResult.getState()==1){
if(faceRecognitionResult.getData()!=null){
FaceRecognitionResult.Data data = faceRecognitionResult.getData();
String name = data.getName();
String gh = data.getGh();
String faceType = data.getFaceType();
String msg = faceRecognitionResult.getMsg();
ConfirmFaceDialog confirmDialog = new ConfirmFaceDialog(context, "人脸识别成功",msg,name,gh,faceType,faceTempPath,new ConfirmFaceDialog.ConfirmDialogFaceListener() {
@Override
public void confirm() {
}
});
confirmDialog.setTvTitle("人脸识别成功");
confirmDialog.setCancelable(false);
confirmDialog.show();
}
}else if(faceRecognitionResult.getState()==0){
String msg = faceRecognitionResult.getMsg();
if(TextUtils.isEmpty(msg)){
msg="超脑连接异常";
}else if("身份证号码为空".equals(msg)){
msg="人脸库没有检索到当前人脸信息，人脸对比结果失败";
}
ConfirmFaceDialog confirmDialog = new ConfirmFaceDialog(context, "人脸识别失败",msg,null,null,null,null, new ConfirmFaceDialog.ConfirmDialogFaceListener() {
@Override
public void confirm() {
}
});
confirmDialog.setTvTitle("人脸识别失败");
confirmDialog.setCancelable(false);
confirmDialog.show();
// if(TextUtils.isEmpty(faceRecognitionResult.getMsg())){
// showToast("人脸识别失败");
// }else{
// showToast(faceRecognitionResult.getMsg());
// }
}
}else {
showToast("数据异常");
}
}
@Override
public void onFailed(int what, Response<String> response) {
showLog("getSisToken onFailed");
}
}, true, true, "人脸识别中,请稍候...");
} catch (Exception e) {
e.printStackTrace();
}
}
}
});
}
private void setAdapter() {
// String[] results = App.getInstance().getUserInfo().getPermissionsResult().split(";");
@ -501,12 +394,12 @@ public class HomeFragment extends BaseFragment {
checkFaceServerConnectStatus();
break;
case 11:
Intent intentYhTake = new Intent(mActivity, HightRiskActivity.class);
Intent intentYhTake = new Intent(mActivity, YhscpActivity.class);
intentYhTake.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP);
// String typeHightRisk = "高风险";
// String urlWHightRisk = "https://mis.dywzhny.com.cn/mobile/ebdapp/view/998396522831962120/page/1069629959971758112-8233268850081530012";
// intentYhTake.putExtra("type",typeHightRisk);
// intentYhTake.putExtra("urlLog",urlWHightRisk);
String typeYhscp = "隐患随手拍";
String urlYhscp = "https://mis.dywzhny.com.cn/mobile/ebdapp/view/995394113075568642/search/995404747431370874-8922672992955770021";
intentYhTake.putExtra("type",typeYhscp);
intentYhTake.putExtra("urlLog",urlYhscp);
startActivity(intentYhTake);
break;
// case 12:
@ -693,6 +586,116 @@ public class HomeFragment extends BaseFragment {
});
}
/**
* 创建一个ActivityResultLauncher
*
* @return
*/
private ActivityResultLauncher<Intent> createFaceRecognitionActivityResultLauncher() {
return registerForActivityResult(new ActivityResultContracts.StartActivityForResult(),
new ActivityResultCallback<ActivityResult>() {
@Override
public void onActivityResult(ActivityResult result) {
int resultCode = result.getResultCode();
if (resultCode == RESULT_OK) {
Intent resultIntent = result.getData();
//byte[] faceByte = resultIntent.getByteArrayExtra("FaceRecognition");
String faceTempPath = resultIntent.getStringExtra("FaceRecognitionPicPath");
File faceFile = new File(faceTempPath);
showLog(String.valueOf(faceFile.length()));
// String fileName = UUID.randomUUID().toString()+".png";
// File fileDir = new File(path);
// if(!fileDir.exists()){
// fileDir.mkdir();
// }
//
// String fileTempName = path + File.separator + fileName;
// showLog(fileTempName);
try {
// FileOutputStream fileOutputStream = new FileOutputStream(fileTempName);
// IoUtil.write(fileOutputStream,true,faceByte);
//File fileFaceUpToServer = new File(fileTempName);
//showLog(String.valueOf(fileFaceUpToServer.length()));
//String url = "http://192.168.2.115:8601/"+Contans.FACE_RECOGNITION_APP_URL;
String url = Contans.IP+Contans.FACE_RECOGNITION_APP_URL;
Request<String> request = NoHttp.createStringRequest(url, RequestMethod.POST);
// showLog(json);
// request.setDefineRequestBodyForJson(json);
request.add("face", faceFile);
NohttpUtils.getInstance().add(mActivity,30,request,new HttpListener<String>(){
@Override
public void onSucceed(int what, Response<String> response) throws ParseException {
String jsonResult = response.get();
showLog("-----face------");
showLog(jsonResult);
FaceRecognitionResult faceRecognitionResult = GsonUtils.GsonToBean(jsonResult,FaceRecognitionResult.class);
if(faceRecognitionResult!=null){
if(faceRecognitionResult.getState()==1){
if(faceRecognitionResult.getData()!=null){
FaceRecognitionResult.Data data = faceRecognitionResult.getData();
String name = data.getName();
String gh = data.getGh();
String faceType = data.getFaceType();
String msg = faceRecognitionResult.getMsg();
ConfirmFaceDialog confirmDialog = new ConfirmFaceDialog(context, "人脸识别成功",msg,name,gh,faceType,faceTempPath,new ConfirmFaceDialog.ConfirmDialogFaceListener() {
@Override
public void confirm() {
}
});
confirmDialog.setTvTitle("人脸识别成功");
confirmDialog.setCancelable(false);
confirmDialog.show();
}
}else if(faceRecognitionResult.getState()==0){
String msg = faceRecognitionResult.getMsg();
if(TextUtils.isEmpty(msg)){
msg="超脑连接异常";
}else if("身份证号码为空".equals(msg)){
msg="人脸库没有检索到当前人脸信息，人脸对比结果失败";
}
ConfirmFaceDialog confirmDialog = new ConfirmFaceDialog(context, "人脸识别失败",msg,null,null,null,null, new ConfirmFaceDialog.ConfirmDialogFaceListener() {
@Override
public void confirm() {
}
});
confirmDialog.setTvTitle("人脸识别失败");
confirmDialog.setCancelable(false);
confirmDialog.show();
// if(TextUtils.isEmpty(faceRecognitionResult.getMsg())){
// showToast("人脸识别失败");
// }else{
// showToast(faceRecognitionResult.getMsg());
// }
}
}else {
showToast("数据异常");
}
}
@Override
public void onFailed(int what, Response<String> response) {
showLog("getSisToken onFailed");
}
}, true, true, "人脸识别中,请稍候...");
} catch (Exception e) {
e.printStackTrace();
}
}
}
});
}
//更新待办
public void updateWaitForToDo() {
getWaitForToDo();

21
app/src/main/java/com/rehome/dywoa/ui/fragment/MineFragment.java
Unescape Escape View File

@ -98,6 +98,7 @@ public class MineFragment extends BaseLazyFragment {
TextView tvVersionName;
TextView tv_count_to_do;
LinearLayout ll_count_to_do;
LinearLayout ll_clean_cache;
@ -145,6 +146,7 @@ public class MineFragment extends BaseLazyFragment {
} else {
path = requireActivity().getFilesDir().getPath() + "/images";
}
}
private void findView() {
@ -155,6 +157,7 @@ public class MineFragment extends BaseLazyFragment {
tvVersionName = view.findViewById(R.id.tv_versionName);
ll_count_to_do = view.findViewById(R.id.ll_count_to_do);
tv_count_to_do = view.findViewById(R.id.tv_count_to_do);
ll_clean_cache = view.findViewById(R.id.ll_clean_cache);
@ -208,6 +211,14 @@ public class MineFragment extends BaseLazyFragment {
}
});
//清除缓存
ll_clean_cache.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
cleanCache();
}
});
}
@Override
@ -529,9 +540,13 @@ public class MineFragment extends BaseLazyFragment {
if (requireActivity().getExternalFilesDir(null) != null) {
String pathSd = Objects.requireNonNull(requireActivity().getExternalFilesDir(null)).getPath() + "/Radio" ;
deleteDirectory(pathSd);
deleteDirectory(path);
createDirectory(path);
} else {
String pathSd = requireActivity().getFilesDir().getPath() + "/Radio";
deleteDirectory(pathSd);
deleteDirectory(path);
createDirectory(path);
}
Toast.makeText(getActivity(), "清除缓存成功", Toast.LENGTH_LONG).show();
}
@ -585,6 +600,12 @@ public class MineFragment extends BaseLazyFragment {
}
}
public static void createDirectory(String filePath) {
File fileDir = new File(filePath);
if(!fileDir.exists()){
fileDir.mkdir();
}
}
/**
* 删除单个文件
*

8
app/src/main/java/com/rehome/dywoa/utils/DataPassUtils.java
Unescape Escape View File

@ -10,7 +10,7 @@ public class DataPassUtils {
try {
//格式化日期的对象(转化成习惯的时间格式)
SimpleDateFormat sdFormat = new SimpleDateFormat("yyyy年MM月dd日");
Date date = sdFormat.parse("2025年01月20日");
Date date = sdFormat.parse("2025年03月21日");
Calendar calendarOne = Calendar.getInstance();
calendarOne.setTime(date);
if (!Calendar.getInstance().after(calendarOne)) {
@ -27,7 +27,7 @@ public class DataPassUtils {
try {
//格式化日期的对象(转化成习惯的时间格式)
SimpleDateFormat sdFormat = new SimpleDateFormat("yyyy年MM月dd日");
Date date = sdFormat.parse("2025年01月20日");
Date date = sdFormat.parse("2026年03月21日");
Calendar calendarOne = Calendar.getInstance();
calendarOne.setTime(date);
if (!Calendar.getInstance().after(calendarOne)) {
@ -43,7 +43,7 @@ public class DataPassUtils {
try {
//格式化日期的对象(转化成习惯的时间格式)
SimpleDateFormat sdFormat = new SimpleDateFormat("yyyy年MM月dd日");
Date date = sdFormat.parse("2025年01月20日");
Date date = sdFormat.parse("2025年03月22日");
Calendar calendarOne = Calendar.getInstance();
calendarOne.setTime(date);
if (!Calendar.getInstance().after(calendarOne)) {
@ -58,7 +58,7 @@ public class DataPassUtils {
try {
//格式化日期的对象(转化成习惯的时间格式)
SimpleDateFormat sdFormat = new SimpleDateFormat("yyyy年MM月dd日");
Date date = sdFormat.parse("2025年01月20日");
Date date = sdFormat.parse("2025年03月23日");
Calendar calendarOne = Calendar.getInstance();
calendarOne.setTime(date);
if (!Calendar.getInstance().after(calendarOne)) {

95
app/src/main/res/layout/activity_yhscp.xml
Unescape Escape View File

@ -0,0 +1,95 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:background="#ffffff"
tools:context=".ui.activity.YhscpActivity">
<androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?android:actionBarSize"
android:background="?attr/colorPrimary"
android:titleTextColor="@android:color/white"
app:theme="@style/Widget.AppCompat.Toolbar"
app:titleTextColor="@android:color/white">
<TextView
android:id="@+id/toolbar_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginTop="10dp"
android:singleLine="true"
android:textColor="@android:color/white"
android:textSize="20sp"/>
</androidx.appcompat.widget.Toolbar>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="150dp"
android:layout_margin="5dp"
android:visibility="gone"
android:background="@drawable/radius"
android:orientation="vertical">
<CheckBox
android:id="@+id/cb_crop"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:visibility="gone"
android:text="是否裁剪图片"
android:textColor="#53575e"
android:textSize="14sp" />
<CheckBox
android:id="@+id/cb_compress"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:visibility="gone"
android:checked="true"
android:text="是否压缩图片"
android:textColor="#53575e"
android:textSize="14sp" />
<CheckBox
android:id="@+id/cb_editor"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:checked="true"
android:gravity="center_vertical"
android:text="是否开启图片编辑"
android:visibility="gone"
android:textColor="#53575e"
android:textSize="14sp" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recycle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="8dp"
android:layout_marginRight="8dp"
android:overScrollMode="never" />
</LinearLayout>
<ProgressBar
android:id="@+id/progressBar"
style="?android:attr/progressBarStyleHorizontal"
android:layout_width="match_parent"
android:layout_height="2dp"
android:progressDrawable="@drawable/progress_bar_color"/>
<LinearLayout
android:id="@+id/container"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
</LinearLayout>
</LinearLayout>

51
app/src/main/res/layout/fragment_mine.xml
Unescape Escape View File

@ -133,6 +133,57 @@
</LinearLayout>
</FrameLayout>
<View
android:layout_width="match_parent"
android:layout_height="25px" />
<FrameLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<TextView
android:id="@+id/tv_clean_cache"
android:layout_width="match_parent"
android:layout_height="100px"
android:drawableLeft="@drawable/icon_clean_cache"
android:drawablePadding="40px"
android:gravity="center_vertical"
android:background="@drawable/login_edit"
android:layout_marginStart="24dp"
android:layout_marginEnd="24dp"
android:padding="20px"
android:text="清除缓存"
android:textColor="@color/black"
android:textSize="30px" />
<LinearLayout
android:id="@+id/ll_clean_cache"
android:layout_width="match_parent"
android:layout_height="100px"
android:gravity="end|center_vertical"
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:padding="2dp"
android:text=""
android:visibility="visible"
android:textColor="#267AE4"
android:textSize="20sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:visibility="invisible"
android:layout_marginEnd="25dp"
android:layout_marginRight="60dp"
android:background="@drawable/packup"
android:textColor="@color/black"
android:textSize="30px" />
</LinearLayout>
</FrameLayout>
</LinearLayout>
</ScrollView>
</LinearLayout>

Write Preview
Loading…
Cancel
Save