优化bug

app/src/main/java/com/datarecovery/master/module/audiorecover/AudioRecoverActivity.java

@@ -177,11 +177,11 @@ public class AudioRecoverActivity extends BaseActivity<ActivityAudioRecoverBindi
             showTrialExportFailDialog = new CommonSureDialog(this);
             showTrialExportFailDialog.setDialogTitle(R.string.trial_export_fail_title)
                     .setDialogContent(R.string.trial_export_fail_content).setSureText(R.string.dialog_trial_recover);
-            showTrialFinishDialog.setOnDialogClickListener(() -> {
+            showTrialExportFailDialog.setOnDialogClickListener(() -> {
                 audioRecoverViewModel.onTrialRecoverClick();
                 EventHelper.report(EventId.hf1001123, Maps.asMap(EventId.EVENT_ID, ReportUtil.getReportId(MemberType.APP_AUDIO_RECOVER)));
             });
-            showTrialFinishDialog.setOnDismissListener(dialog -> EventHelper.report(EventId.hf1001124, Maps.asMap(EventId.EVENT_ID, ReportUtil.getReportId(MemberType.APP_AUDIO_RECOVER))));
+            showTrialExportFailDialog.setOnDismissListener(dialog -> EventHelper.report(EventId.hf1001124, Maps.asMap(EventId.EVENT_ID, ReportUtil.getReportId(MemberType.APP_AUDIO_RECOVER))));
 
         }
         if (!showTrialExportFailDialog.isShowing()) {

app/src/main/java/com/datarecovery/master/module/filerecover/FileRecoverActivity.java

@@ -123,11 +123,11 @@ public class FileRecoverActivity extends BaseActivity<ActivityFileRecoverBinding
             showTrialExportFailDialog = new CommonSureDialog(this);
             showTrialExportFailDialog.setDialogTitle(R.string.trial_export_fail_title)
                     .setDialogContent(R.string.trial_export_fail_content).setSureText(R.string.dialog_trial_recover);
-            showTrialFinishDialog.setOnDialogClickListener(() -> {
+            showTrialExportFailDialog.setOnDialogClickListener(() -> {
                 fileRecoverViewModel.onTrialRecoverClick();
                 EventHelper.report(EventId.hf1001123, Maps.asMap(EventId.EVENT_ID, ReportUtil.getReportId(MemberType.APP_FILE_RECOVER)));
             });
-            showTrialFinishDialog.setOnDismissListener(dialog -> EventHelper.report(EventId.hf1001124, Maps.asMap(EventId.EVENT_ID, ReportUtil.getReportId(MemberType.APP_FILE_RECOVER))));
+            showTrialExportFailDialog.setOnDismissListener(dialog -> EventHelper.report(EventId.hf1001124, Maps.asMap(EventId.EVENT_ID, ReportUtil.getReportId(MemberType.APP_FILE_RECOVER))));
         }
         if (!showTrialExportFailDialog.isShowing()) {
             showTrialExportFailDialog.show();

app/src/main/java/com/datarecovery/master/module/imgrecover/ImageRecoverActivity.java

@@ -344,11 +344,11 @@ public class ImageRecoverActivity extends BaseActivity<ActivityImageRecoverBindi
             showTrialExportFailDialog = new CommonSureDialog(this);
             showTrialExportFailDialog.setDialogTitle(R.string.trial_export_fail_title)
                     .setDialogContent(R.string.trial_export_fail_content).setSureText(R.string.dialog_trial_recover);
-            showTrialFinishDialog.setOnDialogClickListener(() -> {
+            showTrialExportFailDialog.setOnDialogClickListener(() -> {
                 imageRecoverViewModel.onTrialRecoverClick();
                 EventHelper.report(EventId.hf1001123, Maps.asMap(EventId.EVENT_ID, ReportUtil.getReportId(MemberType.APP_IMAGE_RECOVER)));
             });
-            showTrialFinishDialog.setOnDismissListener(dialog -> EventHelper.report(EventId.hf1001124, Maps.asMap(EventId.EVENT_ID, ReportUtil.getReportId(MemberType.APP_IMAGE_RECOVER))));
+            showTrialExportFailDialog.setOnDismissListener(dialog -> EventHelper.report(EventId.hf1001124, Maps.asMap(EventId.EVENT_ID, ReportUtil.getReportId(MemberType.APP_IMAGE_RECOVER))));
         }
         if (!showTrialExportFailDialog.isShowing()) {
             showTrialExportFailDialog.show();

app/src/main/java/com/datarecovery/master/module/videorecover/VideoRecoverActivity.java

@@ -121,11 +121,11 @@ public class VideoRecoverActivity extends BaseActivity<ActivityVideoRecoverBindi
             showTrialExportFailDialog = new CommonSureDialog(this);
             showTrialExportFailDialog.setDialogTitle(R.string.trial_export_fail_title)
                     .setDialogContent(R.string.trial_export_fail_content).setSureText(R.string.dialog_trial_recover);
-            showTrialFinishDialog.setOnDialogClickListener(() -> {
+            showTrialExportFailDialog.setOnDialogClickListener(() -> {
                 videoRecoverViewModel.onTrialRecoverClick();
                 EventHelper.report(EventId.hf1001123, Maps.asMap(EventId.EVENT_ID, ReportUtil.getReportId(MemberType.APP_VIDEO_RECOVER)));
             });
-            showTrialFinishDialog.setOnDismissListener(dialog -> EventHelper.report(EventId.hf1001124, Maps.asMap(EventId.EVENT_ID, ReportUtil.getReportId(MemberType.APP_VIDEO_RECOVER))));
+            showTrialExportFailDialog.setOnDismissListener(dialog -> EventHelper.report(EventId.hf1001124, Maps.asMap(EventId.EVENT_ID, ReportUtil.getReportId(MemberType.APP_VIDEO_RECOVER))));
 
         }
         if (!showTrialExportFailDialog.isShowing()) {

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

@@ -73,14 +73,6 @@
                     android:layout_height="wrap_content"
                     android:layout_centerInParent="true" />
 
-                <com.datarecovery.master.widget.WatermarkView
-                    android:id="@+id/watermark_view"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    app:watermark_color="#6d6d6d"
-                    app:watermark_text="@string/export_without_watermark"
-                    isGone="@{!previewViewModel.isTrial}"
-                    app:watermark_textSize="14sp" />
             </RelativeLayout>
 
 
@@ -100,6 +92,16 @@
                 app:layout_constraintDimensionRatio="360:254"
                 app:layout_constraintTop_toTopOf="@+id/preview_video_container" />
 
+
+            <com.datarecovery.master.widget.WatermarkView
+                android:id="@+id/watermark_view"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                app:watermark_color="#6d6d6d"
+                app:watermark_text="@string/export_without_watermark"
+                isGone="@{!previewViewModel.isTrial}"
+                app:watermark_textSize="14sp" />
+
             <ImageView
                 android:id="@+id/preview_play"
                 android:layout_width="0dp"