每日作业风险清单完成

app/src/main/AndroidManifest.xml

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

app/src/main/java/com/rehome/dywoa/ui/activity/FaceRecognitionAppActivity.java

@@ -286,11 +286,14 @@ public class FaceRecognitionAppActivity extends BaseActivity {
                             mTextureView.setVisibility(View.GONE);
                             stopCamera();
 
+                            Bitmap resizeImage=resizeImage(rectBitmap,480,640);
+//                            Bitmap resizeImage=resizeImage(rectBitmap,1080,1920);
+
                             String fileName = UUID.randomUUID().toString()+".jpeg";
                             String faceTempPath = path + File.separator + fileName;
                             showLog(faceTempPath);
 
-                            BitmapUtil.saveBitmap(faceTempPath,rectBitmap);
+                            BitmapUtil.saveBitmap(faceTempPath,resizeImage);
                             File faceFile = new File(faceTempPath);
                             showLog(String.valueOf(faceFile.length()));
 
@@ -325,6 +328,19 @@ public class FaceRecognitionAppActivity extends BaseActivity {
         return drawable;
     }
 
+    public static Bitmap resizeImage(Bitmap originalImage, int targetWidth, int targetHeight) {
+        // 创建一个Matrix对象，用于包含缩放和平移的操作
+        Matrix matrix = new Matrix();
+        // 计算缩放比例
+        float scaleWidth = (float) targetWidth / originalImage.getWidth();
+        float scaleHeight = (float) targetHeight / originalImage.getHeight();
+        // 通过缩放比例来缩放图片
+        matrix.postScale(scaleWidth, scaleHeight);
+        // 创建新的Bitmap对象，其内容是原始图片的缩小版
+        Bitmap resizedImage = Bitmap.createBitmap(originalImage, 0, 0, originalImage.getWidth(), originalImage.getHeight(), matrix, true);
+        return resizedImage;
+    }
+
     //Bitmap保存成文件
     private void saveBitmapToFile(Bitmap bitmap) {
 

app/src/main/java/com/rehome/dywoa/ui/activity/LoginActivity.kt

@@ -217,8 +217,8 @@ class LoginActivity : BaseActivityOaToolbarViewBinding<ActivityLoginBinding>() {
 //            binding.etUsername.setText("RH00002")
 //            binding.etPassword.setText("A000000a.")
 
-//            binding.etUsername.setText("RH00003")
+            binding.etUsername.setText("RH00003")
-//            binding.etPassword.setText("A000000a.")
+            binding.etPassword.setText("A000000a.")
 
 
             //重仪

app/src/main/java/com/rehome/dywoa/ui/fragment/HomeFragment.java

@@ -37,6 +37,7 @@ import com.rehome.dywoa.bean.FwSingleLoginResult;
 import com.rehome.dywoa.bean.GridItem;
 import com.rehome.dywoa.bean.WaitForBean;
 import com.rehome.dywoa.ui.activity.BiShowActivity;
+import com.rehome.dywoa.ui.activity.EveryDateRiskControllerListActivity;
 import com.rehome.dywoa.ui.activity.FaceRecognitionActivity;
 import com.rehome.dywoa.ui.activity.FaceRecognitionAppActivity;
 import com.rehome.dywoa.ui.activity.FanWeiActivity;
@@ -403,12 +404,17 @@ public class HomeFragment extends BaseFragment {
                         intentYhTake.putExtra("urlLog",urlYhscp);
                         startActivity(intentYhTake);
                         break;
-//                    case 12:
+                    case 12:
-//                        TAG = GridViewDialog.TAG_AF;
+                        Intent intentEveryDateRiskControllerList = new Intent(mActivity, EveryDateRiskControllerListActivity.class);
-//                        break;
+                        intentEveryDateRiskControllerList.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP);
+                        String typeEveryDateRisk = "每日作业管控风险清单";
+                        //String urlYhscp = "https://mis.dywzhny.com.cn/mobile/ebdapp/view/995394113075568642/search/995404747431370874-8922672992955770021";
+                        String urlEveryDateRisk = "https://mis.dywzhny.com.cn/mobile/ebdapp/view/1082990228650598401/search/1082990559573188609-6523675387694155872";
+                        intentEveryDateRiskControllerList.putExtra("type",typeEveryDateRisk);
+                        intentEveryDateRiskControllerList.putExtra("urlLog",urlEveryDateRisk);
+                        startActivity(intentEveryDateRiskControllerList);
+                        break;
                 }
-//                GridViewDialog dialog = new GridViewDialog(getContext(), TAG);
-//                dialog.show();
             }
         });
     }
@@ -464,9 +470,12 @@ public class HomeFragment extends BaseFragment {
 //        String[] titles = {"管控一体化","两票系统", "SIS系统", "机组参数","巡检","点检","运行日志","kks码查询","应急预案","用车","用印","BI"};
 //        int[] imgIds = {R.drawable.icon_runlog_home,R.drawable.icon_liangpiao, R.drawable.icon_sis_new, R.drawable.icon_gcjd_new,R.drawable.xjgz,R.drawable.icon_dianjian,R.drawable.icon_runlog_home,R.drawable.icon_kks,R.drawable.icon_yjya,R.drawable.icon_use_car,R.drawable.icon_use_seal,R.drawable.icon_bi};
 
-        String[] titles = {"管控一体化","两票系统", "SIS系统", "机组参数","巡检","点检","kks码查询","应急预案","BI","高风险","人脸识别","隐患随手拍"};
+        String[] titles = {"管控一体化","两票系统", "SIS系统", "机组参数","巡检","点检","kks码查询","应急预案","BI","高风险","人脸识别","隐患随手拍","每日作业管控风险清单"};
-        int[] imgIds = {R.drawable.icon_gkyth,R.drawable.icon_lpqt, R.drawable.icon_sis_new_first, R.drawable.icon_jzcs_new,R.drawable.icon_qj_new,R.drawable.icon_dj_new,
+        int[] imgIds = {R.drawable.icon_gkyth,R.drawable.icon_lpqt, R.drawable.icon_sis_new_first,
-                R.drawable.icon_kks_search,R.drawable.icon_yjya,R.drawable.icon_bi,R.drawable.icon_high_risk,R.drawable.icon_face_re,R.drawable.icon_rinhuan_take};
+                R.drawable.icon_jzcs_new,R.drawable.icon_qj_new,R.drawable.icon_dj_new,
+                R.drawable.icon_kks_search,R.drawable.icon_yjya,R.drawable.icon_bi,
+                R.drawable.icon_high_risk,R.drawable.icon_face_re,R.drawable.icon_rinhuan_take,
+                R.drawable.icon_zyfx};
 
 
 

app/src/main/res/layout/activity_every_date_risk_controller_list.xml

@@ -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.EveryDateRiskControllerListActivity">
+
+    <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>

app/src/main/res/layout/fragment_home.xml

@@ -80,7 +80,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:background="@color/white"
-                android:numColumns="3" />
+                android:numColumns="4" />
         </LinearLayout>
 
     </androidx.core.widget.NestedScrollView>

app/src/main/res/layout/item_grid.xml

@@ -19,6 +19,7 @@
         android:layout_marginTop="5dp"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:gravity="center_horizontal"
         android:text="申请管理" />
 
 </LinearLayout>