Эх сурвалжийг харах

1.修改Android Apex CRM从相册选择图片失败。

Pen Li 7 жил өмнө
parent
commit
b3925cf099

+ 26 - 2
ApexDrivers/RAUtilsLibrary/src/main/java/com/usai/redant/rautils/utils/ImageUtil.java

@@ -21,6 +21,8 @@ import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.net.URI;
+import java.util.ArrayList;
+import java.util.Arrays;
 
 public class ImageUtil {
 
@@ -43,9 +45,31 @@ public class ImageUtil {
         //sourceFile.get
         String routedPath = "";
         if(file_name==null) {
-            String path = sourceFile.getPath();
+//            String path = sourceFile.getPath();
 
-            routedPath=path.replace(".jpg", "_routed.jpg");
+            String name = sourceFile.getName();
+
+            if (name.contains(".")) {
+                String[] nameComponents = name.split("\\.");
+                nameComponents[nameComponents.length - 2] = nameComponents[nameComponents.length - 2] + "_routed";
+
+                StringBuilder builder = new StringBuilder();
+                for (int i = 0; i < nameComponents.length; i++) {
+
+                    String component = nameComponents[i];
+                    builder.append(component);
+                    if (i != nameComponents.length - 1) {
+                        builder.append(".");
+                    }
+                }
+                name = builder.toString();
+
+            } else {
+                name = name + "_routed";
+            }
+
+//            routedPath=path.replace(".jpg", "_routed.jpg");
+            routedPath = new File(sourceFile.getParent(), name).getAbsolutePath();
         }
         else
         {

+ 3 - 3
ApexDrivers/apexcrm/src/main/java/com/usai/apex/apexcrm/MainActivity.java

@@ -147,8 +147,8 @@ public class MainActivity extends AppCompatActivity implements RAWebView.WebView
 
 //            String url = "http://www.dcloud.io/hellomui/";
 //            String url = "http://192.168.1.151:8080/MyWeb/html/test.html";
-//            String url = "http://192.168.1.108:8081/j/crm/mobile/login";
-            String url = "https://ra.apexshipping.com/apexcrm/crm/mobile/login";
+            String url = "http://192.168.1.108:8081/j/crm/mobile/login";
+//            String url = "https://ra.apexshipping.com/apexcrm/crm/mobile/login";
             Intent intent = getIntent();
             if (intent != null) {
                 String tmpUrl = intent.getStringExtra("url");
@@ -520,7 +520,7 @@ public class MainActivity extends AppCompatActivity implements RAWebView.WebView
         if (resultCode == RESULT_OK) {
             Uri uri = CameraHelper.getImageUriFromData(data);
             String destDir = FileManager.internalStorageTempDir(self);
-            String timeStamp = new SimpleDateFormat("yyyyMMdd_HHmmSS").format(new Date());
+            String timeStamp = new SimpleDateFormat("yyyyMMdd_HHmmSS").format(new Date()) + ".jpg";
             File destF = new File(destDir, timeStamp);
 
             FileManager.copyFileFromUri(self, uri, destF.getAbsolutePath());