0

app/src/main/java/com/epson/cameracopy/ui/CropImageActivity.java

@@ -22,7 +22,7 @@ import android.os.Handler;
 import android.os.Message;
 import android.provider.MediaStore;
 
-import android.support.p000v4.app.FragmentActivity;
+
 import android.text.TextUtils;
 import android.util.AttributeSet;
 import android.util.DisplayMetrics;

app/src/main/java/com/epson/cameracopy/ui/ImagePreviewActivity.java

@@ -15,7 +15,7 @@ import android.os.Bundle;
 
 
 import android.support.p000v4.app.Fragment;
-import android.support.p000v4.app.FragmentActivity;
+
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuItem;

app/src/main/java/com/epson/cameracopy/ui/PrintPreviewActivity.java

@@ -19,7 +19,7 @@ import android.os.Message;
 import android.os.RemoteException;
 
 
-import android.support.p000v4.app.FragmentActivity;
+
 import android.view.KeyEvent;
 import android.view.Menu;
 import android.view.MenuItem;

app/src/main/java/com/epson/memcardacc/ConfirmReadMemcard.java

@@ -7,7 +7,7 @@ import android.os.AsyncTask;
 import android.os.Bundle;
 import android.os.StatFs;
 
-import android.support.p000v4.app.FragmentActivity;
+
 import android.view.View;
 import android.widget.TextView;
 

app/src/main/java/com/epson/memcardacc/ConfirmWriteMemcard.java

@@ -9,7 +9,7 @@ import android.os.Bundle;
 
 
 
-import android.support.p000v4.app.FragmentActivity;
+
 import android.view.View;
 import android.widget.TextView;
 

app/src/main/java/com/epson/memcardacc/MemcardImageGrid.java

@@ -12,7 +12,7 @@ import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
 
-import android.support.p000v4.app.FragmentActivity;
+
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;

app/src/main/java/com/epson/memcardacc/MemcardTopSuper.java

@@ -5,7 +5,7 @@ import android.arch.lifecycle.ViewModelProviders;
 import android.os.AsyncTask;
 import android.os.Bundle;
 
-import android.support.p000v4.app.FragmentActivity;
+
 
 import com.epson.memcardacc.LocalAlertDialogFragment;
 import com.epson.memcardacc.MemcardCheckTask;

app/src/main/java/com/epson/memcardacc/PhotoCopyImageSelectActivity.java

@@ -8,7 +8,7 @@ import android.os.Build;
 import android.os.Bundle;
 
 
-import android.support.p000v4.app.FragmentActivity;
+
 
 import com.epson.memcardacc.AltAlertDialogFragment;
 import com.epson.memcardacc.FileConvertTask;

app/src/main/java/com/epson/mobilephone/common/ReviewInvitationDialog.java

@@ -8,10 +8,12 @@ import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.net.Uri;
 import android.os.Bundle;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.DialogFragment;
+import androidx.fragment.app.FragmentActivity;
 
-
-
-import android.support.p000v4.app.FragmentActivity;
+import epson.print.R;
 
 
 public class ReviewInvitationDialog extends DialogFragment {

app/src/main/java/com/epson/mobilephone/common/wifidirect/ActivityWiFiDirectBase.java

@@ -9,6 +9,9 @@ import epson.print.ActivityIACommon;
 import epson.print.R;
 
 
+/**
+ * 基类
+ */
 public abstract class ActivityWiFiDirectBase extends ActivityIACommon {
     public static final int ID_NEXT = 10;
     public final int RESULT_BACK = 1;

app/src/main/java/com/epson/mobilephone/common/wifidirect/ActivityWiFiDirectManual.java

@@ -11,7 +11,7 @@ import android.os.Message;
 
 
 
-import android.support.p000v4.app.FragmentActivity;
+
 import android.view.View;
 import android.view.ViewGroup;
 import android.webkit.WebView;

app/src/main/java/com/epson/mobilephone/common/wifidirect/DialogProgressWiFiDirect.java

@@ -3,17 +3,20 @@ package com.epson.mobilephone.common.wifidirect;
 import android.app.Dialog;
 import android.content.DialogInterface;
 import android.os.Bundle;
-
-
-
-import android.support.p000v4.app.FragmentManager;
-
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ProgressBar;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AlertDialog;
+import androidx.fragment.app.DialogFragment;
+import androidx.fragment.app.FragmentManager;
+
+import epson.print.R;
+
 public class DialogProgressWiFiDirect extends DialogFragment {
     public static final int MESSAGE_BOTTOM = 1;
     public static final int MESSAGE_ONLY = 2;
@@ -52,15 +55,15 @@ public class DialogProgressWiFiDirect extends DialogFragment {
         bundle.putString(TAG_POSITIVE_MESSAGE, str4);
         bundle.putString(TAG_NEUTRAL_MESSAGE, str5);
         bundle.putString(TAG_NEGATIVE_MESSAGE, str6);
-        dialogProgressWiFiDirect.setArguments(bundle);
+        setArguments(bundle);
         return dialogProgressWiFiDirect;
     }
 
     private void deleteFragment(FragmentManager fragmentManager, String str) {
         Dialog dialog;
         DialogProgressWiFiDirect dialogProgressWiFiDirect = (DialogProgressWiFiDirect) fragmentManager.findFragmentByTag(str);
-        if (dialogProgressWiFiDirect != null && (dialog = dialogProgressWiFiDirect.getDialog()) != null && dialog.isShowing()) {
-            dialogProgressWiFiDirect.dismiss();
+        if (dialogProgressWiFiDirect != null && (dialog = getDialog()) != null && dialog.isShowing()) {
+            dismiss();
         }
     }
 
@@ -81,54 +84,54 @@ public class DialogProgressWiFiDirect extends DialogFragment {
             mActivity = null;
         }
         if (string2 != null) {
-            builder.setTitle((CharSequence) string2);
+            builder.setTitle(string2);
         }
         if (string3 != null) {
-            builder.setPositiveButton((CharSequence) string3, (DialogInterface.OnClickListener) new DialogInterface.OnClickListener() {
+            builder.setPositiveButton(string3, new DialogInterface.OnClickListener() {
                 public void onClick(DialogInterface dialogInterface, int i) {
-                    DialogProgressWiFiDirect.this.dismiss();
-                    if (DialogProgressWiFiDirect.mActivity != null) {
-                        DialogProgressWiFiDirect.mActivity.onPositiveClick(DialogProgressWiFiDirect.mTag);
+                    dismiss();
+                    if (mActivity != null) {
+                        mActivity.onPositiveClick(mTag);
                     }
                 }
             });
         }
         if (string4 != null) {
-            builder.setNeutralButton((CharSequence) string4, (DialogInterface.OnClickListener) new DialogInterface.OnClickListener() {
+            builder.setNeutralButton(string4, new DialogInterface.OnClickListener() {
                 public void onClick(DialogInterface dialogInterface, int i) {
-                    DialogProgressWiFiDirect.this.dismiss();
-                    if (DialogProgressWiFiDirect.mActivity != null) {
-                        DialogProgressWiFiDirect.mActivity.onNeutralClick(DialogProgressWiFiDirect.mTag);
+                    dismiss();
+                    if (mActivity != null) {
+                        mActivity.onNeutralClick(mTag);
                     }
                 }
             });
         }
         if (string5 != null) {
-            builder.setNegativeButton((CharSequence) string5, (DialogInterface.OnClickListener) new DialogInterface.OnClickListener() {
+            builder.setNegativeButton(string5, new DialogInterface.OnClickListener() {
                 public void onClick(DialogInterface dialogInterface, int i) {
-                    DialogProgressWiFiDirect.this.dismiss();
-                    if (DialogProgressWiFiDirect.mActivity != null) {
-                        DialogProgressWiFiDirect.mActivity.onNegativeClick(DialogProgressWiFiDirect.mTag);
+                    dismiss();
+                    if (mActivity != null) {
+                        mActivity.onNegativeClick(mTag);
                     }
                 }
             });
         }
-        ProgressBar progressBar = (ProgressBar) inflate.findViewById(R.C1115id.dialog_progress_id);
+        ProgressBar progressBar = (ProgressBar) inflate.findViewById(R.id.dialog_progress_id);
         if (i == 1) {
             RelativeLayout.LayoutParams layoutParams = (RelativeLayout.LayoutParams) progressBar.getLayoutParams();
             layoutParams.addRule(14);
             progressBar.setLayoutParams(layoutParams);
-            TextView textView = (TextView) inflate.findViewById(R.C1115id.dialog_progress_text_bottom);
+            TextView textView = (TextView) inflate.findViewById(R.id.dialog_progress_text_bottom);
             textView.setText(string);
             progressBar.setVisibility(View.VISIBLE);
             textView.setVisibility(View.VISIBLE);
         } else if (i == 0) {
-            TextView textView2 = (TextView) inflate.findViewById(R.C1115id.dialog_progress_text_right);
+            TextView textView2 = (TextView) inflate.findViewById(R.id.dialog_progress_text_right);
             textView2.setText(string);
             progressBar.setVisibility(View.VISIBLE);
             textView2.setVisibility(View.VISIBLE);
         } else {
-            TextView textView3 = (TextView) inflate.findViewById(R.C1115id.dialog_progress_text_right);
+            TextView textView3 = (TextView) inflate.findViewById(R.id.dialog_progress_text_right);
             textView3.setText(string);
             textView3.setVisibility(View.VISIBLE);
         }

app/src/main/java/com/epson/mobilephone/common/wifidirect/DialogProgressWiFiDirectViewModel.java

@@ -1,7 +1,7 @@
 package com.epson.mobilephone.common.wifidirect;
 
-import android.arch.lifecycle.MutableLiveData;
-import android.arch.lifecycle.ViewModel;
+import androidx.lifecycle.MutableLiveData;
+import androidx.lifecycle.ViewModel;
 
 import java.util.ArrayDeque;
 import java.util.Deque;

app/src/main/java/com/epson/mobilephone/common/wifidirect/EventWrapperWiFiDirect.java

@@ -1,6 +1,8 @@
 package com.epson.mobilephone.common.wifidirect;
 
 
+import androidx.annotation.Nullable;
+
 public class EventWrapperWiFiDirect<T> {
     private boolean handled = false;
     private T mContent;

app/src/main/java/com/epson/mobilephone/common/wifidirect/ManageDefaultNetwork.java

@@ -1,6 +1,7 @@
 package com.epson.mobilephone.common.wifidirect;
 
 import android.annotation.TargetApi;
+import android.app.Service;
 import android.content.Context;
 import android.content.Intent;
 import android.net.ConnectivityManager;
@@ -38,7 +39,7 @@ public class ManageDefaultNetwork {
 
     private ManageDefaultNetwork(Context context) {
         mContext = context.getApplicationContext();
-        connectivityManager = (ConnectivityManager) mContext.getSystemService("connectivity");
+        connectivityManager = (ConnectivityManager) mContext.getSystemService(Service.CONNECTIVITY_SERVICE);
         wifiManager = (WifiManager) mContext.getSystemService(Service.WIFI_SERVICE);
     }
 

app/src/main/java/epson/maintain/activity/EccPrintLog.java

@@ -5,7 +5,7 @@ import android.arch.lifecycle.ViewModelProviders;
 import android.os.AsyncTask;
 import android.os.Bundle;
 
-import android.support.p000v4.app.FragmentActivity;
+
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
 

app/src/main/java/epson/maintain/activity/GetPrinterReplyData.java

@@ -10,7 +10,7 @@ import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
 
-import android.support.p000v4.app.FragmentActivity;
+
 import android.support.p003v7.app.AppCompatActivity;
 import android.view.View;
 import android.view.ViewGroup;

app/src/main/java/epson/maintain/activity/MaintainActivity.java

@@ -23,7 +23,7 @@ import android.os.RemoteException;
 import android.support.annotation.ColorRes;
 
 
-import android.support.p000v4.app.FragmentActivity;
+
 import android.support.p000v4.content.ContextCompat;
 import android.support.p000v4.view.ViewCompat;
 import android.view.Display;

app/src/main/java/epson/print/ActivityDocsPrintPreview.java

@@ -25,7 +25,7 @@ import android.os.IBinder;
 import android.os.Message;
 import android.os.RemoteException;
 import android.preference.PreferenceManager;
-import android.support.p000v4.app.FragmentActivity;
+
 import android.view.Display;
 import android.view.KeyEvent;
 import android.view.LayoutInflater;

app/src/main/java/epson/print/ActivityPrintWeb.java

@@ -19,7 +19,7 @@ import android.os.Handler;
 import android.os.IBinder;
 import android.os.Message;
 import android.os.RemoteException;
-import android.support.p000v4.app.FragmentActivity;
+
 import android.view.Display;
 import android.view.Menu;
 import android.view.MenuItem;

app/src/main/java/epson/print/ActivityViewImageSelect.java

@@ -22,7 +22,7 @@ import android.os.Message;
 import android.os.RemoteException;
 import android.support.annotation.MainThread;
 
-import android.support.p000v4.app.FragmentActivity;
+
 import android.view.KeyEvent;
 import android.view.Menu;
 import android.view.MenuItem;

app/src/main/java/epson/print/storage/ConfirmCancelDialog.java

@@ -4,7 +4,7 @@ import android.app.Dialog;
 import android.content.DialogInterface;
 import android.os.Bundle;
 
-import android.support.p000v4.app.FragmentActivity;
+
 
 import androidx.annotation.NonNull;
 import androidx.fragment.app.DialogFragment;

app/src/main/java/epson/print/storage/OneButtonDialogFragment.java

@@ -5,7 +5,7 @@ import android.app.Dialog;
 import android.content.DialogInterface;
 import android.os.Bundle;
 
-import android.support.p000v4.app.FragmentActivity;
+
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;