version 1.0.2

app/build.gradle

@@ -9,7 +9,7 @@ android {
 
         targetSdkVersion 29
         versionCode 1
-        versionName "1.0.1"
+        versionName "1.0.2"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildTypes {

app/src/main/AndroidManifest.xml

@@ -27,7 +27,8 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <activity android:name=".ui.main.MainActivity" />
+        <activity android:name=".ui.main.MainActivity"
+            android:screenOrientation="portrait"/>
 
         <provider
             android:name="androidx.core.content.FileProvider"

app/src/main/java/com/example/audiovisualrecord/ui/main/MainActivity.java

@@ -5,8 +5,8 @@ import androidx.annotation.RequiresApi;
 import androidx.core.content.FileProvider;
 import androidx.core.os.EnvironmentCompat;
 
-import android.content.ContentResolver;
 import android.content.ContentValues;
+import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.pm.PackageManager;
@@ -23,7 +23,6 @@ import android.util.Log;
 import android.view.View;
 import android.widget.Button;
 import android.widget.TextView;
-import android.widget.Toast;
 
 import com.example.audiovisualrecord.FileUtil;
 import com.example.audiovisualrecord.MagicFileChooser;
@@ -62,7 +61,6 @@ import okhttp3.Response;
 
 public class MainActivity extends BaseActivity implements MainContract.View, View.OnClickListener {
 
-
     private static final int REQUEST_CAPTURE_IMAGE = 100;
     private static final int REQUEST_VIDEO_CAPTURE = 200;
     private static final int PICK_IMAGE_FROM_GALLERY_REQUEST_CODE = 300;
@@ -120,11 +118,10 @@ public class MainActivity extends BaseActivity implements MainContract.View, Vie
         mPresenter = new MainPresenter(this, token);
         mMainData = new MainData();
         mChooseDeviceItemData = new ChooseDeviceItemData();
-
         createSegVideoFolder();
-
     }
 
+    //創建分割後影片資料夾
     private void createSegVideoFolder() {
         File folder = new File(Environment.getExternalStorageDirectory() +
                 File.separator + "Seg_Video");
@@ -161,11 +158,9 @@ public class MainActivity extends BaseActivity implements MainContract.View, Vie
         textShootType = findViewById(R.id.text_shoottype);
         textFactory = findViewById(R.id.text_factory);
         textClass = findViewById(R.id.text_class);
-
     }
 
     private void pickImageFromGallery() {
-
         //Create an Intent with action as ACTION_PICK
         Intent intent = new Intent(Intent.ACTION_GET_CONTENT);
         // Sets the type as image/*. This ensures only components of type image are selected
@@ -186,7 +181,6 @@ public class MainActivity extends BaseActivity implements MainContract.View, Vie
         String[] mimeTypes = {"video/mp4", "video/mov"};
         intent.putExtra(Intent.EXTRA_MIME_TYPES, mimeTypes);
         startActivityForResult(intent, PICK_VIDEO_FROM_GALLERY_REQUEST_CODE);
-
     }
 
     private Uri createImageUri() {
@@ -214,11 +208,9 @@ public class MainActivity extends BaseActivity implements MainContract.View, Vie
                     photoFile = createImageFile();
                 } catch (IOException e) {
                     e.printStackTrace();
-
                 }
             }
 
-
             if (photoFile != null) {
                 mCameraImagePath = photoFile.getAbsolutePath();
                 if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
@@ -235,8 +227,6 @@ public class MainActivity extends BaseActivity implements MainContract.View, Vie
                     pictureIntent.addFlags(Intent.FLAG_GRANT_WRITE_URI_PERMISSION);
                     startActivityForResult(pictureIntent, REQUEST_CAPTURE_IMAGE);
                 }
-
-
             }
         }
     }
@@ -266,7 +256,7 @@ public class MainActivity extends BaseActivity implements MainContract.View, Vie
             SimpleDateFormat df = new SimpleDateFormat("yyyyMMdd_HHmmss");
             String formattedDate = df.format(c);
 
-            filePhth = path + "/" + formattedDate + ".jpg";
+            filePhth = path + "/IMG_" + formattedDate + ".jpg";
             fileName = System.currentTimeMillis() + "";
             Log.e("filepath", filePhth);
             File file1 = new File(filePhth);
@@ -277,7 +267,7 @@ public class MainActivity extends BaseActivity implements MainContract.View, Vie
             //图片路径
 //            MediaStore.Images.Media.insertImage(context.getContentResolver(),
 //                    filePhth,fileName , null);
-
+            //多存一張照片
 //            MediaStore.Images.Media.insertImage(this.getContentResolver(), bitmap, "", "");
             
             this.sendBroadcast(new Intent(Intent.ACTION_MEDIA_SCANNER_SCAN_FILE, Uri.parse("file://" + file1.getAbsolutePath())));
@@ -326,14 +316,9 @@ public class MainActivity extends BaseActivity implements MainContract.View, Vie
     protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
         if (requestCode == REQUEST_CAPTURE_IMAGE && resultCode == RESULT_OK) {
-
-
             Bitmap myBitmap = BitmapFactory.decodeFile(mCameraImagePath);
             String path1 = Environment.getExternalStorageDirectory().toString() + "/Pictures";
-
             SavaImage(myBitmap, path1);
-
-
         }
 
         if (requestCode == REQUEST_VIDEO_CAPTURE && resultCode == RESULT_OK) {
@@ -390,8 +375,6 @@ public class MainActivity extends BaseActivity implements MainContract.View, Vie
                 // TODO here====================
                 //影片的uri
             }
-
-
         }
         if (requestCode == PICK_FILE_REQUEST_CODE && resultCode == RESULT_OK) {
             Uri selectedFile = data.getData();
@@ -436,7 +419,6 @@ public class MainActivity extends BaseActivity implements MainContract.View, Vie
                 } else {
                     openCameraIntent();
                 }
-
                 break;
 
             case R.id.btnGetImageFromGallery:
@@ -446,8 +428,6 @@ public class MainActivity extends BaseActivity implements MainContract.View, Vie
                 } else {
                     pickImageFromGallery();
                 }
-
-
                 break;
 
             case R.id.btnGetVideoFromGallery:
@@ -457,7 +437,6 @@ public class MainActivity extends BaseActivity implements MainContract.View, Vie
                 } else {
                     pickVideoFromGallery();
                 }
-
                 break;
 
             case R.id.btnRecordVideo:
@@ -467,7 +446,6 @@ public class MainActivity extends BaseActivity implements MainContract.View, Vie
                 } else {
                     openRecordVideoIntent();
                 }
-
                 break;
 
             case R.id.tv_company:
@@ -574,9 +552,16 @@ public class MainActivity extends BaseActivity implements MainContract.View, Vie
         uploadPath = mPresenter.onJudgmentPath(pathCompany, pathFactoryArea, pathFactoryClass, pathClass, pathShootType);
         dismissProgressDialog();
         showProgressDialog(type);
+
+
+        for (String path : uriList) {
+            updateMedia(path,this);
+        }
+
         new Thread(new Runnable() {
             @Override
             public void run() {
+
                 String path1 = uploadPath;
 
                 OkHttpClient client = new OkHttpClient().newBuilder()
@@ -595,6 +580,7 @@ public class MainActivity extends BaseActivity implements MainContract.View, Vie
                     Log.e("file5555555", uploadFile.length() / 1024 / 1024 + "mb");
                     buildernew.addFormDataPart("file", uploadFile.getName(),
                             RequestBody.create(MediaType.parse("application/octet-stream"), uploadFile));
+
                 }
                 RequestBody body = buildernew.build();
 
@@ -704,5 +690,14 @@ public class MainActivity extends BaseActivity implements MainContract.View, Vie
         }
     };
 
+    //廣播更新媒體庫
+    private static void updateMedia(String path , Context context){
+        File file = new File(path);
+        Intent intent = new Intent();
+        intent.setAction(Intent.ACTION_MEDIA_SCANNER_SCAN_FILE);
+        intent.setData(Uri.fromFile(file));
+        context.sendBroadcast(intent);
+    }
+
 
 }