From 3cd712eafebcf030c7cecfa6b657d35f54d7e7d1 Mon Sep 17 00:00:00 2001
From: hwf453 <hwf453@163.com>
Date: Fri, 7 Jun 2024 17:36:55 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BB=93=E5=BA=93=E7=89=A9?=
 =?UTF-8?q?=E8=B5=84=E6=89=93=E5=8D=B0=E5=B8=A6/=E5=90=8D=E7=A7=B0?=
 =?UTF-8?q?=E7=9A=84=E6=97=A0=E6=B3=95=E6=8B=8D=E7=85=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../zhdcoa/ui/activity/LoginActivity.kt       | 13 ++---
 .../ui/activity/WztpblScDetailActivity.java   | 50 ++++++++++++++++---
 2 files changed, 51 insertions(+), 12 deletions(-)

diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/LoginActivity.kt b/app/src/main/java/com/rehome/zhdcoa/ui/activity/LoginActivity.kt
index 00d3cef..3152c72 100644
--- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/LoginActivity.kt
+++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/LoginActivity.kt
@@ -180,11 +180,12 @@ class LoginActivity : BaseActivityOaToolbarViewBinding<ActivityLoginBinding>() {
 
         if (BuildConfig.LOG_ERROR) {
             //        管理员
-            binding.etUsername.setText("ZHPS_Admin")
-            binding.etPassword.setText("Rehome.zhps@996")
+//            binding.etUsername.setText("ZHPS_Admin")
+//            binding.etPassword.setText("Rehome.zhps@996")
 
-//            binding.etUsername.setText("310386")
-//            binding.etPassword.setText("Zhps$cc0386")
+            //马
+//            binding.etUsername.setText("310482")
+//            binding.etPassword.setText("Maying2008!")
             //        生产岗位 卢高波
 //            binding.etUsername.setText("310492")
 //            binding.etPassword.setText("Dudu520520+")
@@ -202,8 +203,8 @@ class LoginActivity : BaseActivityOaToolbarViewBinding<ActivityLoginBinding>() {
 //            binding.etUsername.setText("310430")
 //            binding.etPassword.setText("Laq@201610")
             //欧建荣
-            binding.etUsername.setText("310285")
-            binding.etPassword.setText("@Ojr310285")
+//            binding.etUsername.setText("310285")
+//            binding.etPassword.setText("@Ojr310285")
 
         }
 
diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/WztpblScDetailActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/WztpblScDetailActivity.java
index 18bb949..62bc9bc 100644
--- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/WztpblScDetailActivity.java
+++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/WztpblScDetailActivity.java
@@ -402,7 +402,8 @@ public class WztpblScDetailActivity extends BaseActivityOaToolbarViewBinding<Act
 
 
         String itemStr = getIntent().getStringExtra("item");
-        Log.i("app", itemStr);
+        showLog("<--------->");
+        showLog(itemStr);
         item = GsonUtils.GsonToBean(itemStr, WarehouseHuoJiaBean.RowsBean.class);
 //        item.setItemnum("IT62592");
 //        item.setItemid("86384");
@@ -528,7 +529,7 @@ public class WztpblScDetailActivity extends BaseActivityOaToolbarViewBinding<Act
                 if (ContextCompat.checkSelfPermission(WztpblScDetailActivity.this, Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) {
                     ActivityCompat.requestPermissions(WztpblScDetailActivity.this, new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE}, FJTXC);
                 } else {
-                    choosePhoto(FJTXC);
+                    choosePhotoFjt(FJTXC);
                 }
             }
         });
@@ -1101,7 +1102,16 @@ public class WztpblScDetailActivity extends BaseActivityOaToolbarViewBinding<Act
      */
     private void cropFromTake(String name, int flag) throws IOException {
 
-        stFileName = name + ".jpg";
+        if(name!=null&&name.contains("/")){
+            showLog("contains /");
+            stFileName = name.replace("/","_") + ".jpg";
+        }else{
+            showLog("no contains /");
+            stFileName = name + ".jpg";
+        }
+
+        showLog(stFileName);
+        //stFileName = name + ".jpg";
         this.deleteFileIfNeed(path, stFileName);
         File fos = this.createFileIfNeed(path, stFileName);
         Uri uri = FileProvider.getUriForFile(context, BuildConfig.APPLICATION_ID + ".fileprovider", fos);
@@ -1121,7 +1131,16 @@ public class WztpblScDetailActivity extends BaseActivityOaToolbarViewBinding<Act
      */
     private void cropFromTakeFjt(String name, int flag) throws IOException {
 
-        fjtFileName = name + ".jpg";
+        if(name!=null&&name.contains("/")){
+            showLog("contains /");
+            fjtFileName = name.replace("/","_") + ".jpg";
+        }else{
+            showLog("no contains /");
+            fjtFileName = name + ".jpg";
+        }
+
+        showLog(stFileName);
+        //fjtFileName = name + ".jpg";
         this.deleteFileIfNeed(path, fjtFileName);
         File fos = this.createFileIfNeed(path, fjtFileName);
         Uri uri = FileProvider.getUriForFile(context, BuildConfig.APPLICATION_ID + ".fileprovider", fos);
@@ -1177,7 +1196,16 @@ public class WztpblScDetailActivity extends BaseActivityOaToolbarViewBinding<Act
      */
     private void choosePhoto(int flag) {
 
-        stFileName = item.getItemnum() + ".jpg";
+        if(item.getItemnum()!=null&&item.getItemnum().contains("/")){
+            showLog("contains /");
+            stFileName = item.getItemnum().replace("/","_") + ".jpg";
+        }else{
+            showLog("no contains /");
+            stFileName = item.getItemnum() + ".jpg";
+        }
+
+        showLog(stFileName);
+        //stFileName = item.getItemnum() + ".jpg";
         this.deleteFileIfNeed(path, stFileName);
         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) {
             Intent fjtxc = new Intent(Intent.ACTION_PICK, MediaStore.Images.Media.EXTERNAL_CONTENT_URI);
@@ -1199,7 +1227,16 @@ public class WztpblScDetailActivity extends BaseActivityOaToolbarViewBinding<Act
      */
     private void choosePhotoFjt(int flag) {
 
-        fjtFileName = item.getItemnum() + "FJT" + ".jpg";
+        if(item.getItemnum()!=null&&item.getItemnum().contains("/")){
+            showLog("contains /");
+            fjtFileName = item.getItemnum().replace("/","_") + "FJT" + ".jpg";
+        }else{
+            showLog("no contains /");
+            fjtFileName = item.getItemnum() + "FJT" + ".jpg";
+        }
+
+        showLog(fjtFileName);
+        //fjtFileName = item.getItemnum() + "FJT" + ".jpg";
         this.deleteFileIfNeed(path, fjtFileName);
         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) {
             Intent fjtxc = new Intent(Intent.ACTION_PICK, MediaStore.Images.Media.EXTERNAL_CONTENT_URI);
@@ -1212,6 +1249,7 @@ public class WztpblScDetailActivity extends BaseActivityOaToolbarViewBinding<Act
             intent.setType("image/jpeg");
             startActivityForResult(intent, flag);
         }
+
     }
 
     /**