liuyuqi-dellpc 3 years ago
parent
commit
c58998fa7e
49 changed files with 242 additions and 150 deletions
  1. 1 4
      app/src/main/java/com/epson/iprint/shared/EpsoniPrintSharedActivity.java
  2. 2 2
      app/src/main/java/com/epson/iprint/storage/ConfirmCancelDialog.java
  3. 1 1
      app/src/main/java/com/epson/iprint/storage/LocalProgressDialog.java
  4. 2 2
      app/src/main/java/com/epson/iprint/storage/OneButtonDialogFragment.java
  5. 1 1
      app/src/main/java/com/epson/iprint/storage/gdrivev3/GoogleV3UploadSignInActivity.java
  6. 1 1
      app/src/main/java/com/epson/iprint/storage/gdrivev3/ListAndDownloadActivity.java
  7. 4 4
      app/src/main/java/com/epson/mobilephone/common/escpr/EscprLib.java
  8. 2 0
      app/src/main/java/com/epson/mobilephone/common/guide/GuideWebviewFragment.java
  9. 6 2
      app/src/main/java/com/epson/mobilephone/common/guide/NoticeGuideActivity.java
  10. 4 4
      app/src/main/java/com/epson/mobilephone/common/maintain/MaintainPrinter.java
  11. 8 8
      app/src/main/java/com/epson/mobilephone/common/maintain2/MaintainPrinter2.java
  12. 10 10
      app/src/main/java/com/epson/mobilephone/common/usb/UsbPrintDriver.java
  13. 7 7
      app/src/main/java/com/epson/mobilephone/common/usb/UsbPrinter.java
  14. 8 8
      app/src/main/java/com/epson/mobilephone/common/usb/UsbReciever.java
  15. 2 2
      app/src/main/java/epson/epsonconnectregistration/ECBaseTask.java
  16. 3 3
      app/src/main/java/epson/epsonconnectregistration/ECConfigurationTask.java
  17. 1 1
      app/src/main/java/epson/epsonconnectregistration/SoapAUTHENTICATIONDataInfo.java
  18. 6 6
      app/src/main/java/epson/epsonconnectregistration/SoapConfigDataParser.java
  19. 17 17
      app/src/main/java/epson/epsonconnectregistration/SoapWEBSETUPDataInfo.java
  20. 1 1
      app/src/main/java/epson/maintain/activity/CheckEulaActivity.java
  21. 1 1
      app/src/main/java/epson/maintain/activity/GetPrinterReplyData.java
  22. 2 2
      app/src/main/java/epson/maintain/activity/MaintainActivity.java
  23. 2 2
      app/src/main/java/epson/maintain/activity/MaintainPrinterSearchActivity.java
  24. 4 4
      app/src/main/java/epson/print/IprintHome.java
  25. 19 38
      app/src/main/java/epson/print/Util/EPLog.java
  26. 1 1
      app/src/main/java/epson/print/imgsel/ImageFindTask.java
  27. 1 1
      app/src/main/java/epson/print/imgsel/ImageFolderListFragment.java
  28. 1 1
      app/src/main/java/epson/print/imgsel/ImageGridFragment.java
  29. 1 1
      app/src/main/java/epson/print/imgsel/ImageSelectActivity.java
  30. 1 1
      app/src/main/java/epson/print/imgsel/ImageThumbnailTask.java
  31. 1 1
      app/src/main/java/epson/print/imgsel/LocalAlertDialogFragment.java
  32. 1 1
      app/src/main/java/epson/print/imgsel/ProgressDialogFragment.java
  33. 1 1
      app/src/main/java/epson/print/inkrpln/InkRplnProgressDialog.java
  34. 1 1
      app/src/main/java/epson/print/inkrpln/InkRplnProgressFragment.java
  35. 1 1
      app/src/main/java/epson/print/inkrpln/JumpUrlFragment.java
  36. 1 1
      app/src/main/java/epson/print/inkrpln/JumpUrlProgressActivity.java
  37. 1 1
      app/src/main/java/epson/print/screen/PrintSetting.java
  38. 1 1
      app/src/main/java/epson/print/screen/SearchPrinterScr.java
  39. 1 1
      app/src/main/java/epson/print/screen/StringListSelectDialog.java
  40. 3 3
      app/src/main/java/epson/print/service/EpsonService.java
  41. 2 2
      app/src/main/java/epson/support/DeviceInformationActivity.java
  42. 1 0
      guidelib/.gitignore
  43. 37 0
      guidelib/build.gradle
  44. 0 0
      guidelib/consumer-rules.pro
  45. 21 0
      guidelib/proguard-rules.pro
  46. 26 0
      guidelib/src/androidTest/java/com/epson/guidelib/ExampleInstrumentedTest.java
  47. 5 0
      guidelib/src/main/AndroidManifest.xml
  48. 17 0
      guidelib/src/test/java/com/epson/guidelib/ExampleUnitTest.java
  49. 1 0
      settings.gradle

+ 1 - 4
app/src/main/java/com/epson/iprint/shared/EpsoniPrintSharedActivity.java

@@ -8,11 +8,8 @@ import android.content.Intent;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
-import android.support.p000v4.app.DialogFragment;
-import android.support.p000v4.app.FragmentActivity;
-import android.support.p003v7.app.AppCompatActivity;
-
 import androidx.appcompat.app.AppCompatActivity;
+import androidx.fragment.app.FragmentActivity;
 
 import com.epson.iprint.prtlogger.CommonLog;
 import com.epson.iprint.prtlogger.NewLoggerController;

+ 2 - 2
app/src/main/java/com/epson/iprint/storage/ConfirmCancelDialog.java

@@ -4,8 +4,8 @@ import android.app.Dialog;
 import android.content.DialogInterface;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
-import android.support.p000v4.app.DialogFragment;
-import android.support.p000v4.app.FragmentActivity;
+
+
 import android.support.p003v7.app.AlertDialog;
 import epson.print.R;
 

+ 1 - 1
app/src/main/java/com/epson/iprint/storage/LocalProgressDialog.java

@@ -4,7 +4,7 @@ import android.app.Dialog;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
-import android.support.p000v4.app.DialogFragment;
+
 import android.support.p000v4.app.FragmentManager;
 import android.view.KeyEvent;
 import android.view.LayoutInflater;

+ 2 - 2
app/src/main/java/com/epson/iprint/storage/OneButtonDialogFragment.java

@@ -6,8 +6,8 @@ import android.content.DialogInterface;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
-import android.support.p000v4.app.DialogFragment;
-import android.support.p000v4.app.FragmentActivity;
+
+
 import epson.print.R;
 
 public class OneButtonDialogFragment extends DialogFragment {

+ 1 - 1
app/src/main/java/com/epson/iprint/storage/gdrivev3/GoogleV3UploadSignInActivity.java

@@ -6,7 +6,7 @@ import android.content.Intent;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
-import android.support.p003v7.app.AppCompatActivity;
+
 
 import androidx.appcompat.app.AppCompatActivity;
 

+ 1 - 1
app/src/main/java/com/epson/iprint/storage/gdrivev3/ListAndDownloadActivity.java

@@ -7,7 +7,7 @@ import android.os.Build;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
-import android.support.p000v4.app.DialogFragment;
+
 import android.support.p000v4.app.Fragment;
 import android.support.p000v4.app.FragmentManager;
 import android.view.Menu;

+ 4 - 4
app/src/main/java/com/epson/mobilephone/common/escpr/EscprLib.java

@@ -261,7 +261,7 @@ public class EscprLib {
     }
 
     public void findPrinterCallback(String str) {
-        EpLog.m78i("called findPrinterCallback : %s", str);
+        EpLog.i("called findPrinterCallback : %s", str);
         if (mHandler != null) {
             Message obtain = Message.obtain();
             obtain.what = 0;
@@ -271,7 +271,7 @@ public class EscprLib {
     }
 
     public void epsNotifyDataChange(String str) {
-        EpLog.m78i("  @@@@@@@@@@   called epsNotifyDataChange : %s", str);
+        EpLog.i("  @@@@@@@@@@   called epsNotifyDataChange : %s", str);
         if (mHandler != null) {
             Message obtain = Message.obtain();
             obtain.what = 0;
@@ -325,7 +325,7 @@ public class EscprLib {
     }
 
     public int doFindPrinter(int i, int i2) {
-        EpLog.m78i("escprLib2", "**********Call do find printer************");
+        EpLog.i("escprLib2", "**********Call do find printer************");
         return epsWrapperFindPrinter(i, i2);
     }
 
@@ -366,7 +366,7 @@ public class EscprLib {
         String str = printerList;
         if (str != null && str.length() > 0) {
             String name = getClass().getName();
-            EpLog.m78i(name, "EXTRACT Printer information: " + printerList);
+            EpLog.i(name, "EXTRACT Printer information: " + printerList);
             String[] split = printerList.split("\\|\\|");
             if (this.printerIp == null || printerId == null || !this.printerIp.equals(split[2]) || printerId.equals(split[4])) {
                 EpLog.m77i("JAVA mIsSearch == " + mIsSearch);

+ 2 - 0
app/src/main/java/com/epson/mobilephone/common/guide/GuideWebviewFragment.java

@@ -9,6 +9,8 @@ import android.view.ViewGroup;
 import android.webkit.WebView;
 import android.widget.FrameLayout;
 
+import androidx.fragment.app.Fragment;
+
 import com.epson.guidelib.R;
 
 public class GuideWebviewFragment extends Fragment {

+ 6 - 2
app/src/main/java/com/epson/mobilephone/common/guide/NoticeGuideActivity.java

@@ -14,16 +14,19 @@ import android.widget.TextView;
 
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.AppCompatActivity;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentStatePagerAdapter;
 import androidx.viewpager.widget.ViewPager;
-
-import com.epson.guidelib.R;
 import com.epson.mobilephone.common.guide.GuideWebviewFragment;
 
 import java.util.ArrayList;
 import java.util.Locale;
 
+import epson.print.R;
+
 public class NoticeGuideActivity extends AppCompatActivity implements GuideWebviewFragment.MyClickListener {
+
     public static int DIALOG_MODE_OFF = 20001;
     public static int DIALOG_MODE_ON = 20000;
     public static int DIALOG_MODE_ONLY_BUTTON = 20002;
@@ -59,6 +62,7 @@ public class NoticeGuideActivity extends AppCompatActivity implements GuideWebvi
         String str;
         super.onCreate(bundle);
         setContentView(R.layout.activity_notice_guide);
+
         Intent intent = getIntent();
         if (intent != null) {
             htmlpath = intent.getStringArrayListExtra(KEY_HTML_PATH);

+ 4 - 4
app/src/main/java/com/epson/mobilephone/common/maintain/MaintainPrinter.java

@@ -27,7 +27,7 @@ public class MaintainPrinter {
 
     public int doInitDriver(Context context, int i) {
         String path = context.getExternalFilesDir((String) null).getPath();
-        EpLog.m78i("MaintainPrinter", "**********doInitDriver************:" + path);
+        EpLog.i("MaintainPrinter", "**********doInitDriver************:" + path);
         return mEscprLib.init_driver(context, path);
     }
 
@@ -36,7 +36,7 @@ public class MaintainPrinter {
     }
 
     public int doFindPrinter(int i, int i2) {
-        EpLog.m78i("MaintainPrinter", "**********Call do find printer************");
+        EpLog.i("MaintainPrinter", "**********Call do find printer************");
         return mEscprLib.search_printer((String) null);
     }
 
@@ -61,7 +61,7 @@ public class MaintainPrinter {
     }
 
     public int doDoMainteCmd(int i) {
-        EpLog.m78i("MaintainPrinter", "**********doDoMainteCmd************");
+        EpLog.i("MaintainPrinter", "**********doDoMainteCmd************");
         return mEscprLib.epsWrapperDoMainteCmd(i);
     }
 
@@ -74,7 +74,7 @@ public class MaintainPrinter {
     }
 
     public int doProbePrinter(int i, int i2, String str) {
-        EpLog.m78i("MaintainPrinter", "doProbePrinter");
+        EpLog.i("MaintainPrinter", "doProbePrinter");
         return mEscprLib.search_printer(str);
     }
 }

+ 8 - 8
app/src/main/java/com/epson/mobilephone/common/maintain2/MaintainPrinter2.java

@@ -42,25 +42,25 @@ public class MaintainPrinter2 {
     }
 
     public int doInitDriver(Context context, int i) {
-        EpLog.m78i("MaintainPrinter2", " @@@@@@@    doInitDriver                 @");
+        EpLog.i("MaintainPrinter2", " @@@@@@@    doInitDriver                 @");
         EpLog.m77i(mEscpLib.is64bit() ? "Native is operating at ☆ 64 bit !!" : "Native is operating at 32 bit");
         return mEscpLib.epsWrapperInitDriver(context, i);
     }
 
     public int doReleaseDriver() {
-        EpLog.m78i("MaintainPrinter2", " xxxxxxx    doReleaseDriver                x");
+        EpLog.i("MaintainPrinter2", " xxxxxxx    doReleaseDriver                x");
         return mEscpLib.release_driver();
     }
 
     public int doFindPrinter(int i, int i2) {
         int doFindPrinter;
         synchronized (lockObj) {
-            EpLog.m78i("MaintainPrinter2", "**********Call do find printer************");
+            EpLog.i("MaintainPrinter2", "**********Call do find printer************");
             mEscpLib.setSearchStt(true);
             mEscpLib.resetIPAdressCheck();
-            EpLog.m78i("MaintainPrinter2", "findType = " + i);
+            EpLog.i("MaintainPrinter2", "findType = " + i);
             doFindPrinter = mEscpLib.doFindPrinter(i, i2);
-            EpLog.m78i("MaintainPrinter2", "**********Finish do find printer************");
+            EpLog.i("MaintainPrinter2", "**********Finish do find printer************");
         }
         return doFindPrinter;
     }
@@ -97,7 +97,7 @@ public class MaintainPrinter2 {
     public int doDoMainteCmd(int i) {
         int epsWrapperDoMainteCmd;
         synchronized (lockObj) {
-            EpLog.m78i("MaintainPrinter2", "**********doDoMainteCmd************");
+            EpLog.i("MaintainPrinter2", "**********doDoMainteCmd************");
             epsWrapperDoMainteCmd = mEscpLib.epsWrapperDoMainteCmd(i);
         }
         return epsWrapperDoMainteCmd;
@@ -114,13 +114,13 @@ public class MaintainPrinter2 {
     public int doProbePrinter(int i, String str, String str2, int i2) {
         int epsWrapperProbePrinter2;
         synchronized (lockObj) {
-            EpLog.m78i("MaintainPrinter2", "**********Call doProbePrinter************");
+            EpLog.i("MaintainPrinter2", "**********Call doProbePrinter************");
             mEscpLib.resetIPAdressCheck();
             epsWrapperProbePrinter2 = mEscpLib.epsWrapperProbePrinter2(i, str, str2, i2);
             if (epsWrapperProbePrinter2 < 0) {
                 EpLog.m72e("MaintainPrinter2", "ret=" + epsWrapperProbePrinter2);
             }
-            EpLog.m78i("MaintainPrinter2", "**********Finish doProbePrinter************");
+            EpLog.i("MaintainPrinter2", "**********Finish doProbePrinter************");
         }
         return epsWrapperProbePrinter2;
     }

+ 10 - 10
app/src/main/java/com/epson/mobilephone/common/usb/UsbPrintDriver.java

@@ -79,14 +79,14 @@ public class UsbPrintDriver {
             java.lang.String r2 = r1.toString()     // Catch:{ all -> 0x0059 }
             r0.append(r2)     // Catch:{ all -> 0x0059 }
             java.lang.String r0 = r0.toString()     // Catch:{ all -> 0x0059 }
-            com.epson.mobilephone.common.EpLog.m78i(r5, r0)     // Catch:{ all -> 0x0059 }
+            com.epson.mobilephone.common.EpLog.i(r5, r0)     // Catch:{ all -> 0x0059 }
             r1.closePort()     // Catch:{ all -> 0x0059 }
             java.util.ArrayList<com.epson.mobilephone.common.usb.UsbPrinter> r5 = r4.usbPrintersPemmited     // Catch:{ all -> 0x0059 }
             boolean r5 = r5.remove(r1)     // Catch:{ all -> 0x0059 }
             if (r5 == 0) goto L_0x0057
             java.lang.String r5 = "Tag"
             java.lang.String r0 = "EPSON delete success"
-            com.epson.mobilephone.common.EpLog.m78i(r5, r0)     // Catch:{ all -> 0x0059 }
+            com.epson.mobilephone.common.EpLog.i(r5, r0)     // Catch:{ all -> 0x0059 }
         L_0x0057:
             monitor-exit(r4)     // Catch:{ all -> 0x0059 }
             return
@@ -133,7 +133,7 @@ public class UsbPrintDriver {
                                 }
                                 if (!(usbEndpoint == null || usbEndpoint2 == null)) {
                                     UsbPrinter usbPrinter = new UsbPrinter(this.usbManager, usbDevice, usbInterface, usbEndpoint, usbEndpoint2);
-                                    EpLog.m78i("EPSON", "Found Printer " + usbPrinter.toString());
+                                    EpLog.i("EPSON", "Found Printer " + usbPrinter.toString());
                                     arrayList.add(usbPrinter);
                                 }
                             }
@@ -154,7 +154,7 @@ public class UsbPrintDriver {
             r4 = this;
             java.lang.String r0 = "UsbPrintDriver"
             java.lang.String r1 = "Call findDevice"
-            com.epson.mobilephone.common.EpLog.m78i(r0, r1)
+            com.epson.mobilephone.common.EpLog.i(r0, r1)
             monitor-enter(r4)
             r0 = 1
             if (r5 != 0) goto L_0x0016
@@ -200,7 +200,7 @@ public class UsbPrintDriver {
     }
 
     public int openPort(int[] iArr) {
-        EpLog.m78i(TAG, "Call openPort");
+        EpLog.i(TAG, "Call openPort");
         synchronized (this) {
             for (int i = 0; i < usbPrintersPemmited.size(); i++) {
                 UsbPrinter usbPrinter = usbPrintersPemmited.get(i);
@@ -229,7 +229,7 @@ public class UsbPrintDriver {
     }
 
     public long readPort(int i, byte[] bArr, int i2) {
-        EpLog.m78i(TAG, "Call readPort");
+        EpLog.i(TAG, "Call readPort");
         synchronized (this) {
             UsbPrinter findPrinterOpened = findPrinterOpened(i);
             if (findPrinterOpened == null) {
@@ -241,7 +241,7 @@ public class UsbPrintDriver {
     }
 
     public long writePort(int i, byte[] bArr, int i2) {
-        EpLog.m78i(TAG, "Call writePort");
+        EpLog.i(TAG, "Call writePort");
         synchronized (this) {
             UsbPrinter findPrinterOpened = findPrinterOpened(i);
             if (findPrinterOpened == null) {
@@ -253,7 +253,7 @@ public class UsbPrintDriver {
     }
 
     public long getDeviceIdString(int i, byte[] bArr, int i2) {
-        EpLog.m78i(TAG, "Call getDeviceIdString");
+        EpLog.i(TAG, "Call getDeviceIdString");
         synchronized (this) {
             UsbPrinter findPrinterOpened = findPrinterOpened(i);
             if (findPrinterOpened == null) {
@@ -265,7 +265,7 @@ public class UsbPrintDriver {
     }
 
     public int softReset(int i) {
-        EpLog.m78i(TAG, "Call softReset");
+        EpLog.i(TAG, "Call softReset");
         synchronized (this) {
             UsbPrinter findPrinterOpened = findPrinterOpened(i);
             if (findPrinterOpened == null) {
@@ -277,7 +277,7 @@ public class UsbPrintDriver {
     }
 
     public void closePort(int i) {
-        EpLog.m78i(TAG, "Call closePort");
+        EpLog.i(TAG, "Call closePort");
         synchronized (this) {
             UsbPrinter findPrinterOpened = findPrinterOpened(i);
             if (findPrinterOpened != null) {

+ 7 - 7
app/src/main/java/com/epson/mobilephone/common/usb/UsbPrinter.java

@@ -84,12 +84,12 @@ public class UsbPrinter {
             return -1;
         }
         setStartTime();
-        EpLog.m78i(TAG, "bulkTransfer length=" + i);
+        EpLog.i(TAG, "bulkTransfer length=" + i);
         int bulkTransfer = usbPrinter.bulkTransfer(this.endPointIn, bArr, i, Constants.EDAM_BUSINESS_NOTEBOOKS_MAX);
-        EpLog.m78i(TAG, "bulkTransfer readByte=" + bulkTransfer);
+        EpLog.i(TAG, "bulkTransfer readByte=" + bulkTransfer);
         if (bulkTransfer < 0 && (getElapsedTime()) >= 4500.0d) {
             bulkTransfer = 0;
-            EpLog.m78i(TAG, "bulkTransfer timeout occurred");
+            EpLog.i(TAG, "bulkTransfer timeout occurred");
         }
         usbPrinter.releaseInterface(this.usbInterface);
         return (long) bulkTransfer;
@@ -103,12 +103,12 @@ public class UsbPrinter {
             return -1;
         }
         setStartTime();
-        EpLog.m78i(TAG, "bulkTransfer length=" + i);
+        EpLog.i(TAG, "bulkTransfer length=" + i);
         int bulkTransfer = usbPrinter.bulkTransfer(this.endPointOut, bArr, i, Constants.EDAM_BUSINESS_NOTEBOOKS_MAX);
-        EpLog.m78i(TAG, "bulkTransfer writtenByte=" + bulkTransfer);
+        EpLog.i(TAG, "bulkTransfer writtenByte=" + bulkTransfer);
         if (bulkTransfer < 0 && (getElapsedTime()) >= 4500.0d) {
             bulkTransfer = 0;
-            EpLog.m78i(TAG, "bulkTransfer timeout occurred");
+            EpLog.i(TAG, "bulkTransfer timeout occurred");
         }
         usbPrinter.releaseInterface(this.usbInterface);
         return (long) bulkTransfer;
@@ -131,7 +131,7 @@ public class UsbPrinter {
         }
         int controlTransfer = usbPrinter.controlTransfer(161, 0, 0, usbInterface.getId() << 8, bArr, i, Constants.EDAM_BUSINESS_NOTEBOOKS_MAX);
         if (controlTransfer > 0) {
-            EpLog.m78i("EPSON", "DeviceIdString = " + new String(bArr, 2, controlTransfer - 2));
+            EpLog.i("EPSON", "DeviceIdString = " + new String(bArr, 2, controlTransfer - 2));
         }
         usbPrinter.releaseInterface(this.usbInterface);
         return (long) controlTransfer;

+ 8 - 8
app/src/main/java/com/epson/mobilephone/common/usb/UsbReciever.java

@@ -26,13 +26,13 @@ public class UsbReciever extends Activity {
         Intent intent = getIntent();
         String action = intent.getAction();
         if ("android.hardware.usb.action.USB_DEVICE_ATTACHED".equals(action)) {
-            EpLog.m78i("Tag", "android.hardware.usb.action.USB_DEVICE_ATTACHED");
+            EpLog.i("Tag", "android.hardware.usb.action.USB_DEVICE_ATTACHED");
             UsbDevice usbDevice = (UsbDevice) intent.getParcelableExtra("device");
             if (usbDevice != null) {
                 Iterator<UsbPrinter> it = UsbPrintDriver.getInstance(this).findPrinters(false, Constants.EPSON_VENDERID).iterator();
                 while (it.hasNext()) {
                     if (it.next().getUsbDevice().getDeviceId() == usbDevice.getDeviceId()) {
-                        EpLog.m78i("Tag", "EPSON Printer ATTACHED");
+                        EpLog.i("Tag", "EPSON Printer ATTACHED");
                         getPermission(usbDevice, new UsbPermissionReceiverCallback() {
                             public void permissionGranted(Context context, boolean z) {
                                 if (z) {
@@ -43,12 +43,12 @@ public class UsbReciever extends Activity {
                                     intent.setClassName(context, className);
                                     try {
                                         UsbReciever.this.startActivity(intent);
-                                        EpLog.m70d("EPSON", "UsbReciever ACTION_MAIN");
+                                        EpLog.d("EPSON", "UsbReciever ACTION_MAIN");
                                     } catch (Exception e) {
                                         e.printStackTrace();
                                     }
                                 }
-                                EpLog.m70d("EPSON", "UsbReciever finish()");
+                                EpLog.d("EPSON", "UsbReciever finish()");
                                 UsbReciever.this.finish();
                             }
                         });
@@ -60,12 +60,12 @@ public class UsbReciever extends Activity {
             synchronized (this) {
                 UsbDevice usbDevice2 = (UsbDevice) intent.getParcelableExtra("device");
                 if (!intent.getBooleanExtra("permission", false) || usbDevice2 == null) {
-                    EpLog.m70d("EPSON", "permission denied for device");
+                    EpLog.d("EPSON", "permission denied for device");
                     if (permissionGrantedcallback != null) {
                         permissionGrantedcallback.permissionGranted(this, false);
                     }
                 } else {
-                    EpLog.m78i("EPSON", "HAS PERMISSION");
+                    EpLog.i("EPSON", "HAS PERMISSION");
                     if (permissionGrantedcallback != null) {
                         permissionGrantedcallback.permissionGranted(this, true);
                     }
@@ -78,7 +78,7 @@ public class UsbReciever extends Activity {
     public static class UsbReceiver extends BroadcastReceiver {
         public void onReceive(Context context, Intent intent) {
             if ("android.hardware.usb.action.USB_DEVICE_DETACHED".equals(intent.getAction())) {
-                EpLog.m78i("Tag", "android.hardware.usb.action.USB_DEVICE_DETACHED");
+                EpLog.i("Tag", "android.hardware.usb.action.USB_DEVICE_DETACHED");
                 UsbDevice usbDevice = (UsbDevice) intent.getParcelableExtra("device");
                 if (usbDevice != null) {
                     UsbPrintDriver.getInstance(context).deletePrinterPermmited(usbDevice);
@@ -93,7 +93,7 @@ public class UsbReciever extends Activity {
             UsbPrintDriver.getInstance(this).getUsbManager().requestPermission(usbDevice, PendingIntent.getBroadcast(this, 0, new Intent(ACTION_USB_PERMISSION), 0));
             permissionGrantedcallback = usbPermissionReceiverCallback;
         } else {
-            EpLog.m78i("EPSON", "HAS PERMISSION");
+            EpLog.i("EPSON", "HAS PERMISSION");
             if (usbPermissionReceiverCallback != null) {
                 usbPermissionReceiverCallback.permissionGranted(this, true);
             }

+ 2 - 2
app/src/main/java/epson/epsonconnectregistration/ECBaseTask.java

@@ -39,7 +39,7 @@ public abstract class ECBaseTask extends AsyncTask<Void, Void, ECStatus> {
     }
 
     private void openWebPage(Activity activity, Uri uri) {
-        EpLog.m70d(TAG, "Open WebConfig uri = " + uri.toString());
+        EpLog.d(TAG, "Open WebConfig uri = " + uri.toString());
         activity.startActivity(new Intent("android.intent.action.VIEW", uri));
     }
 
@@ -70,7 +70,7 @@ public abstract class ECBaseTask extends AsyncTask<Void, Void, ECStatus> {
         if (str == null || str.length() != 5) {
             str = "en-US";
         }
-        EpLog.m70d(TAG, "getLang: " + str);
+        EpLog.d(TAG, "getLang: " + str);
         return str;
     }
 }

+ 3 - 3
app/src/main/java/epson/epsonconnectregistration/ECConfigurationTask.java

@@ -34,7 +34,7 @@ public class ECConfigurationTask extends ECBaseTask {
             EpLog.m83w(TAG, "enableProgressText Failed");
             return;
         }
-        EpLog.m70d(TAG, "enableProgressText called");
+        EpLog.d(TAG, "enableProgressText called");
         findViewById.setVisibility(z ? 0 : 4);
     }
 
@@ -107,7 +107,7 @@ public class ECConfigurationTask extends ECBaseTask {
         if (activity == null) {
             EpLog.m83w(TAG, "activity is null. Maybe activity died");
         } else if (ECStatus.ERROR_NONE.equals(eCStatus)) {
-            EpLog.m70d(TAG, "Succeed Configuration");
+            EpLog.d(TAG, "Succeed Configuration");
             AlertDialog create = new AlertDialog.Builder(activity).setTitle(R.string.ec_enabled_title).setMessage(R.string.ec_enabled_message).setPositiveButton(R.string.str_next, (DialogInterface.OnClickListener) new DialogInterface.OnClickListener() {
                 public void onClick(DialogInterface dialogInterface, int i) {
                     ECConfigurationTask eCConfigurationTask = ECConfigurationTask.this;
@@ -118,7 +118,7 @@ public class ECConfigurationTask extends ECBaseTask {
             create.setCancelable(false);
             create.show();
         } else {
-            EpLog.m70d(TAG, "Failed Configuration");
+            EpLog.d(TAG, "Failed Configuration");
             AlertDialog create2 = new AlertDialog.Builder(activity).setTitle(R.string.ec_enabling_error_title).setMessage(R.string.ec_enabling_error_message).setPositiveButton(R.string.str_ok, (DialogInterface.OnClickListener) new DialogInterface.OnClickListener() {
                 public void onClick(DialogInterface dialogInterface, int i) {
                     activity.finish();

+ 1 - 1
app/src/main/java/epson/epsonconnectregistration/SoapAUTHENTICATIONDataInfo.java

@@ -20,7 +20,7 @@ public class SoapAUTHENTICATIONDataInfo extends SoapConfigDataParser {
     public boolean isAdminMode() {
         EpLog.i(TAG, "Enter isAdminMode");
         if (!getRetVal()) {
-            EpLog.m78i(TAG, "return = " + getRetVal());
+            EpLog.i(TAG, "return = " + getRetVal());
             return false;
         } else if (STATUS_ENABLE.equals(getValue(ID_ADMINLOCK))) {
             return true;

+ 6 - 6
app/src/main/java/epson/epsonconnectregistration/SoapConfigDataParser.java

@@ -44,10 +44,10 @@ public abstract class SoapConfigDataParser {
         boolean z = false;
         for (int eventType = newPullParser.getEventType(); eventType != 1; eventType = newPullParser.next()) {
             if (eventType == 0) {
-                EpLog.m70d(TAG, "Start document");
+                EpLog.d(TAG, "Start document");
             } else if (eventType == 2) {
                 String name = newPullParser.getName();
-                EpLog.m70d(TAG, "Start tag " + newPullParser.getName() + " prefix = " + newPullParser.getNamespacePrefix(newPullParser.getDepth()));
+                EpLog.d(TAG, "Start tag " + newPullParser.getName() + " prefix = " + newPullParser.getNamespacePrefix(newPullParser.getDepth()));
                 if (!ELEMENT_DATA.equals(name)) {
                     if (ELEMENT_GROUP.equals(name)) {
                         String attributeValue = newPullParser.getAttributeValue((String) null, "id");
@@ -55,7 +55,7 @@ public abstract class SoapConfigDataParser {
                             ret = "true".equalsIgnoreCase(newPullParser.getAttributeValue((String) null, ELEMENT_RETURN));
                             z = true;
                         } else {
-                            EpLog.m70d(TAG, "Unexpected group" + attributeValue);
+                            EpLog.d(TAG, "Unexpected group" + attributeValue);
                         }
                     } else if (ELEMENT_D.equals(name)) {
                         str = newPullParser.getAttributeValue((String) null, "id");
@@ -65,7 +65,7 @@ public abstract class SoapConfigDataParser {
                 }
             } else if (eventType == 3) {
                 String name2 = newPullParser.getName();
-                EpLog.m70d(TAG, "End tag " + name2);
+                EpLog.d(TAG, "End tag " + name2);
                 if (ELEMENT_GROUP.equals(name2)) {
                     z = false;
                 }
@@ -74,11 +74,11 @@ public abstract class SoapConfigDataParser {
                 String text = newPullParser.getText();
                 if (!(!z || str == null || text == null)) {
                     valueMap.put(str, text);
-                    EpLog.m70d(TAG, "Data = " + str + " : " + text);
+                    EpLog.d(TAG, "Data = " + str + " : " + text);
                 }
             }
         }
-        EpLog.m70d(TAG, "End document");
+        EpLog.d(TAG, "End document");
     }
 
     public String getValue(String str) {

+ 17 - 17
app/src/main/java/epson/epsonconnectregistration/SoapWEBSETUPDataInfo.java

@@ -36,9 +36,9 @@ public class SoapWEBSETUPDataInfo extends SoapConfigDataParser {
     }
 
     public boolean isUnregisteredECPrinter() {
-        EpLog.m78i(TAG, "Enter isUnregisteredECPrinter");
+        EpLog.i(TAG, "Enter isUnregisteredECPrinter");
         if (!getRetVal()) {
-            EpLog.m78i(TAG, "return = " + getRetVal());
+            EpLog.i(TAG, "return = " + getRetVal());
             return false;
         }
         try {
@@ -47,7 +47,7 @@ public class SoapWEBSETUPDataInfo extends SoapConfigDataParser {
                 return false;
             }
             if ((valueOf.intValue() & 8) == 0 && (valueOf.intValue() & 16) == 0) {
-                EpLog.m78i(TAG, "Cannot enable EC without delete account -> unregistered");
+                EpLog.i(TAG, "Cannot enable EC without delete account -> unregistered");
                 return true;
             }
             if (BoxConstants.ROOT_FOLDER_ID.equals(getValue(ID_WEBSERVER_STATUS)) || BoxConstants.ROOT_FOLDER_ID.equals(getValue(ID_XMPPSERVER_STATUS))) {
@@ -55,7 +55,7 @@ public class SoapWEBSETUPDataInfo extends SoapConfigDataParser {
                 Integer valueOf3 = Integer.valueOf(valueOf2.intValue());
                 Integer valueOf4 = Integer.valueOf(new Double((valueOf2.doubleValue() - (valueOf2.intValue())) * 100.0d).intValue());
                 if (valueOf3.intValue() == 1 && valueOf4.intValue() == 0) {
-                    EpLog.m78i(TAG, "WebServerStatus:disable or XMPPServerStatus:disable -> unregistered");
+                    EpLog.i(TAG, "WebServerStatus:disable or XMPPServerStatus:disable -> unregistered");
                     return true;
                 }
             }
@@ -68,9 +68,9 @@ public class SoapWEBSETUPDataInfo extends SoapConfigDataParser {
     }
 
     public ECStatus checkECPrinterStatus() {
-        EpLog.m78i(TAG, "Enter isUnregisteredECPrinter");
+        EpLog.i(TAG, "Enter isUnregisteredECPrinter");
         if (!getRetVal()) {
-            EpLog.m78i(TAG, "return = " + getRetVal());
+            EpLog.i(TAG, "return = " + getRetVal());
             return ECStatus.ERROR_CANNOT_ENABLE;
         }
         try {
@@ -79,7 +79,7 @@ public class SoapWEBSETUPDataInfo extends SoapConfigDataParser {
                 return ECStatus.ERROR_PRINTER_EC_REGISTERED;
             }
             if ((valueOf.intValue() & 8) == 0 && (valueOf.intValue() & 16) == 0) {
-                EpLog.m78i(TAG, "Cannot enable EC without delete account -> unregistered");
+                EpLog.i(TAG, "Cannot enable EC without delete account -> unregistered");
                 return ECStatus.ERROR_NONE;
             }
             if (BoxConstants.ROOT_FOLDER_ID.equals(getValue(ID_WEBSERVER_STATUS)) || BoxConstants.ROOT_FOLDER_ID.equals(getValue(ID_XMPPSERVER_STATUS))) {
@@ -89,7 +89,7 @@ public class SoapWEBSETUPDataInfo extends SoapConfigDataParser {
                 if (valueOf3.intValue() != 1 || valueOf4.intValue() != 0) {
                     return ECStatus.ERROR_PRINTER_NOT_SUPPORT_EC;
                 }
-                EpLog.m78i(TAG, "WebServerStatus:disable or XMPPServerStatus:disable -> unregistered");
+                EpLog.i(TAG, "WebServerStatus:disable or XMPPServerStatus:disable -> unregistered");
                 return ECStatus.ERROR_NONE;
             }
             return ECStatus.ERROR_CANNOT_ENABLE;
@@ -101,36 +101,36 @@ public class SoapWEBSETUPDataInfo extends SoapConfigDataParser {
     }
 
     public boolean inProgress() {
-        EpLog.m78i(TAG, "Enter inProgress");
+        EpLog.i(TAG, "Enter inProgress");
         if (!getRetVal()) {
-            EpLog.m78i(TAG, "return = " + getRetVal());
+            EpLog.i(TAG, "return = " + getRetVal());
             return false;
         } else if (!RESULT_WORKING.equals(getValue(ID_SETUP_RESULT))) {
             return false;
         } else {
-            EpLog.m78i(TAG, "Working");
+            EpLog.i(TAG, "Working");
             return true;
         }
     }
 
     public boolean isSucceeded() {
         String value;
-        EpLog.m78i(TAG, "Enter isSucceeded");
+        EpLog.i(TAG, "Enter isSucceeded");
         if (!getRetVal()) {
-            EpLog.m78i(TAG, "return = " + getRetVal());
+            EpLog.i(TAG, "return = " + getRetVal());
             return false;
         } else if (!ExifInterface.GPS_MEASUREMENT_2D.equals(getValue(ID_SETUP_RESULT)) || (value = getValue(ID_ADMIN_URL)) == null || value.isEmpty()) {
             return false;
         } else {
-            EpLog.m78i(TAG, "Succeeded");
+            EpLog.i(TAG, "Succeeded");
             return true;
         }
     }
 
     public Uri getRegistrationUri() {
-        EpLog.m78i(TAG, "Enter isSucceeded");
+        EpLog.i(TAG, "Enter isSucceeded");
         if (!getRetVal()) {
-            EpLog.m78i(TAG, "return = " + getRetVal());
+            EpLog.i(TAG, "return = " + getRetVal());
             return null;
         }
         try {
@@ -139,7 +139,7 @@ public class SoapWEBSETUPDataInfo extends SoapConfigDataParser {
                 return null;
             }
             Uri build = new Uri.Builder().scheme(parse.getScheme()).authority(parse.getAuthority()).path(parse.getPath().replace("/setup/", "/nsetup/")).encodedQuery(parse.getQuery()).appendQueryParameter("from", "Alpha".equals(BuildConfig.FLAVOR) ? "setuptool" : "printerfinder").build();
-            EpLog.m78i(TAG, "rebuildUri = " + build);
+            EpLog.i(TAG, "rebuildUri = " + build);
             return build;
         } catch (NullPointerException e) {
             e.printStackTrace();

+ 1 - 1
app/src/main/java/epson/maintain/activity/CheckEulaActivity.java

@@ -1,7 +1,7 @@
 package epson.maintain.activity;
 
 import android.os.Bundle;
-import android.support.p003v7.app.AppCompatActivity;
+
 import android.view.View;
 import android.widget.Button;
 import android.widget.TextView;

+ 1 - 1
app/src/main/java/epson/maintain/activity/GetPrinterReplyData.java

@@ -11,7 +11,7 @@ import android.os.Handler;
 import android.os.Message;
 
 
-import android.support.p003v7.app.AppCompatActivity;
+
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;

+ 2 - 2
app/src/main/java/epson/maintain/activity/MaintainActivity.java

@@ -321,7 +321,7 @@ public class MaintainActivity extends ActivityIACommon implements View.OnClickLi
     }
 
     protected void onCreate(Bundle bundle) {
-        EpLog.m78i(TAG, "onCreate IN");
+        EpLog.i(TAG, "onCreate IN");
         super.onCreate(bundle);
         setContentView(R.layout.maintain);
         mContext = this;
@@ -381,7 +381,7 @@ public class MaintainActivity extends ActivityIACommon implements View.OnClickLi
         ((ImageView) findViewById(R.id.printer_setting_arrow)).setVisibility(View.GONE);
         mVSerialSeparator.setVisibility(View.GONE);
         mLLSerialNo.setVisibility(View.GONE);
-        EpLog.m78i(TAG, "onCreate :: doInitDriver");
+        EpLog.i(TAG, "onCreate :: doInitDriver");
         mPrinter.doInitDriver(this, 2);
         isResearchScanner = Utils.getPrefBoolean(getApplicationContext(), Constants.SCAN_REFS_USED_SCANNER_PATH, Constants.SCAN_REFS_SETTINGS_RESEACH);
         if (MyPrinter.getCurPrinter(this).getName() == null) {

+ 2 - 2
app/src/main/java/epson/maintain/activity/MaintainPrinterSearchActivity.java

@@ -910,11 +910,11 @@ public class MaintainPrinterSearchActivity extends ActivityIACommon implements C
     protected void onResume() {
         mActivityForegroundLifetime = true;
         super.onResume();
-        EpLog.m78i(TAG, "onResume()");
+        EpLog.i(TAG, "onResume()");
         dismissPrinterNotFoundDialog();
         if (this.printer_location == 1) {
             mHandler.sendEmptyMessageDelayed(1, 300);
-            EpLog.m70d(TAG, "Send CHECK_PRINTER Message.");
+            EpLog.d(TAG, "Send CHECK_PRINTER Message.");
         }
         if (this.printer_location == 1 && mBleButton.getTag() == null && BleWork.isStartBleProcess(this, false)) {
             EpLog.m71e("blePrinterCheck");

+ 4 - 4
app/src/main/java/epson/print/IprintHome.java

@@ -359,7 +359,7 @@ public class IprintHome extends ActivityIACommon implements CommonDefine {
     }
 
     private void updatePrinterInfo() {
-        EpLog.m70d(TAG, "updatePrinterInfo");
+        EpLog.d(TAG, "updatePrinterInfo");
         MyPrinter curPrinter = MyPrinter.getCurPrinter(this);
         if (curPrinter.getName() != null) {
             printerName.setText(curPrinter.getUserDefName(this));
@@ -371,15 +371,15 @@ public class IprintHome extends ActivityIACommon implements CommonDefine {
         printerLocation = curPrinter.getLocation();
         printerSerial = curPrinter.getSerialNo();
         deviceID = curPrinter.getName();
-        EpLog.m70d(TAG, "" + printerId + ":" + printerIp + ":" + printerLocation + ":" + printerSerial + ":" + deviceID);
+        EpLog.d(TAG, "" + printerId + ":" + printerIp + ":" + printerLocation + ":" + printerSerial + ":" + deviceID);
         updatePrinterIcon();
         updateMenu();
         if (!(printerLocation == 1 && WiFiDirectManager.getConnectInfo(getApplicationContext(), WiFiDirectManager.DEVICE_TYPE_PRINTER) == null) && (printerLocation != 3 || !Utils.isConnectedWifi(getApplicationContext()))) {
-            EpLog.m70d(TAG, "########################");
+            EpLog.d(TAG, "########################");
             mHandler.sendEmptyMessage(1);
             return;
         }
-        EpLog.m70d(TAG, "@@@@@@@@@@@@@@@@@@@@@@");
+        EpLog.d(TAG, "@@@@@@@@@@@@@@@@@@@@@@");
         mHandler.sendEmptyMessage(0);
     }
 

+ 19 - 38
app/src/main/java/epson/print/Util/EPLog.java

@@ -26,85 +26,72 @@ public final class EPLog {
         }
     }
 
-    /* renamed from: v */
-    public static void m314v() {
+    public static void v() {
         if (isDebug) {
             Log.v("Epson App", getMetaInfo());
         }
     }
 
-    /* renamed from: v */
-    public static void m315v(String str) {
+    public static void v(String str) {
         if (isDebug) {
             Log.v("Epson App", getMetaInfo() + null2str(str));
         }
     }
-
-    /* renamed from: v */
-    public static void m316v(String str, String str2) {
+    public static void v(String str, String str2) {
         if (isDebug) {
             Log.v(str, getMetaInfo() + null2str(str2));
         }
     }
 
-    /* renamed from: d */
-    public static void m303d() {
+    public static void d() {
         if (isDebug) {
             Log.d("Epson App", getMetaInfo());
         }
     }
 
-    /* renamed from: d */
-    public static void m304d(String str) {
+    public static void d(String str) {
         if (isDebug) {
             Log.d("Epson App", getMetaInfo() + null2str(str));
         }
     }
 
-    /* renamed from: d */
-    public static void m305d(String str, String str2) {
+    public static void d(String str, String str2) {
         if (isDebug) {
             Log.d(str, getMetaInfo() + null2str(str2));
         }
     }
 
-    /* renamed from: i */
-    public static void m311i() {
+    public static void i() {
         if (isDebug) {
             Log.i("Epson App", getMetaInfo());
         }
     }
-
-    /* renamed from: i */
-    public static void m312i(String str) {
+    public static void i(String str) {
         if (isDebug) {
             Log.i("Epson App", getMetaInfo() + null2str(str));
         }
     }
 
-    /* renamed from: i */
-    public static void m313i(String str, String str2) {
+    public static void i(String str, String str2) {
         if (isDebug) {
             Log.i(str, getMetaInfo() + null2str(str2));
         }
     }
 
-    /* renamed from: w */
-    public static void m317w(String str) {
+
+    public static void w(String str) {
         if (isDebug) {
             Log.w("Epson App", getMetaInfo() + null2str(str));
         }
     }
 
-    /* renamed from: w */
-    public static void m318w(String str, String str2) {
+    public static void w(String str, String str2) {
         if (isDebug) {
             Log.w(str, getMetaInfo() + null2str(str2));
         }
     }
 
-    /* renamed from: w */
-    public static void m320w(String str, Throwable th) {
+    public static void w(String str, Throwable th) {
         if (isDebug) {
             Log.w("Epson App", getMetaInfo() + null2str(str), th);
             printThrowable(th);
@@ -114,8 +101,7 @@ public final class EPLog {
         }
     }
 
-    /* renamed from: w */
-    public static void m319w(String str, String str2, Throwable th) {
+    public static void w(String str, String str2, Throwable th) {
         if (isDebug) {
             Log.w(str, getMetaInfo() + null2str(str2), th);
             printThrowable(str, th);
@@ -125,22 +111,19 @@ public final class EPLog {
         }
     }
 
-    /* renamed from: e */
-    public static void m306e(String str) {
+    public static void e(String str) {
         if (isDebug) {
             Log.e("Epson App", getMetaInfo() + null2str(str));
         }
     }
 
-    /* renamed from: e */
-    public static void m307e(String str, String str2) {
+    public static void e(String str, String str2) {
         if (isDebug) {
             Log.e(str, getMetaInfo() + null2str(str2));
         }
     }
 
-    /* renamed from: e */
-    public static void m309e(String str, Throwable th) {
+    public static void e(String str, Throwable th) {
         if (isDebug) {
             Log.e("Epson App", getMetaInfo() + null2str(str), th);
             printThrowable(th);
@@ -150,8 +133,7 @@ public final class EPLog {
         }
     }
 
-    /* renamed from: e */
-    public static void m308e(String str, String str2, Throwable th) {
+    public static void e(String str, String str2, Throwable th) {
         if (isDebug) {
             Log.e(str, getMetaInfo() + null2str(str2), th);
             printThrowable(str, th);
@@ -161,8 +143,7 @@ public final class EPLog {
         }
     }
 
-    /* renamed from: e */
-    public static void m310e(Throwable th) {
+    public static void e(Throwable th) {
         if (isDebug) {
             printThrowable(th);
             if (th.getCause() != null) {

+ 1 - 1
app/src/main/java/epson/print/imgsel/ImageFindTask.java

@@ -3,7 +3,7 @@ package epson.print.imgsel;
 import android.content.ContentResolver;
 import android.graphics.Bitmap;
 import android.os.AsyncTask;
-import android.support.p000v4.app.FragmentActivity;
+
 import epson.print.ImageItem;
 import epson.print.imgsel.ImageFinder;
 import java.lang.ref.WeakReference;

+ 1 - 1
app/src/main/java/epson/print/imgsel/ImageFolderListFragment.java

@@ -4,7 +4,7 @@ import android.content.Intent;
 import android.graphics.Bitmap;
 import android.os.Bundle;
 import android.support.p000v4.app.Fragment;
-import android.support.p000v4.app.FragmentActivity;
+
 import android.support.p000v4.app.ListFragment;
 import android.view.View;
 import android.widget.ListAdapter;

+ 1 - 1
app/src/main/java/epson/print/imgsel/ImageGridFragment.java

@@ -8,7 +8,7 @@ import android.os.AsyncTask;
 import android.os.Build;
 import android.os.Bundle;
 import android.support.p000v4.app.Fragment;
-import android.support.p000v4.app.FragmentActivity;
+
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;

+ 1 - 1
app/src/main/java/epson/print/imgsel/ImageSelectActivity.java

@@ -5,7 +5,7 @@ import android.app.Dialog;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.p000v4.app.DialogFragment;
+
 import android.support.p000v4.app.FragmentManager;
 import android.view.Menu;
 import android.view.MenuItem;

+ 1 - 1
app/src/main/java/epson/print/imgsel/ImageThumbnailTask.java

@@ -3,7 +3,7 @@ package epson.print.imgsel;
 import android.content.ContentResolver;
 import android.graphics.Bitmap;
 import android.os.AsyncTask;
-import android.support.p000v4.app.FragmentActivity;
+
 import epson.print.ImageItem;
 import epson.print.Util.EPLog;
 import epson.print.imgsel.ImageFinder;

+ 1 - 1
app/src/main/java/epson/print/imgsel/LocalAlertDialogFragment.java

@@ -4,7 +4,7 @@ import android.app.AlertDialog;
 import android.app.Dialog;
 import android.content.DialogInterface;
 import android.os.Bundle;
-import android.support.p000v4.app.DialogFragment;
+
 import epson.print.R;
 
 public class LocalAlertDialogFragment extends DialogFragment {

+ 1 - 1
app/src/main/java/epson/print/imgsel/ProgressDialogFragment.java

@@ -2,7 +2,7 @@ package epson.print.imgsel;
 
 import android.os.Bundle;
 import android.support.annotation.Nullable;
-import android.support.p000v4.app.DialogFragment;
+
 
 public class ProgressDialogFragment extends DialogFragment {
     public void onCreate(@Nullable Bundle bundle) {

+ 1 - 1
app/src/main/java/epson/print/inkrpln/InkRplnProgressDialog.java

@@ -3,7 +3,7 @@ package epson.print.inkrpln;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.p003v7.app.AppCompatActivity;
+
 
 import androidx.appcompat.app.AppCompatActivity;
 

+ 1 - 1
app/src/main/java/epson/print/inkrpln/InkRplnProgressFragment.java

@@ -9,7 +9,7 @@ import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.annotation.UiThread;
 import android.support.p000v4.app.Fragment;
-import android.support.p000v4.app.FragmentActivity;
+
 import android.support.p000v4.app.FragmentManager;
 import epson.print.R;
 import epson.print.IprintApplication;

+ 1 - 1
app/src/main/java/epson/print/inkrpln/JumpUrlFragment.java

@@ -6,7 +6,7 @@ import android.os.AsyncTask;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.p000v4.app.Fragment;
-import android.support.p000v4.app.FragmentActivity;
+
 import android.support.p000v4.app.FragmentManager;
 import epson.print.R;
 import epson.print.IprintApplication;

+ 1 - 1
app/src/main/java/epson/print/inkrpln/JumpUrlProgressActivity.java

@@ -4,7 +4,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
-import android.support.p003v7.app.AppCompatActivity;
+
 
 import androidx.appcompat.app.AppCompatActivity;
 

+ 1 - 1
app/src/main/java/epson/print/screen/PrintSetting.java

@@ -146,7 +146,7 @@ public class PrintSetting {
                     if (columnName.equals("key")) {
                         str = query.getString(i);
                     } else if (columnName.equals(BoxRequestsMetadata.UpdateItemMetadata.BoxMetadataUpdateTask.VALUE)) {
-                        EpLog.m78i("さーびす", "PUT key: " + str + "  getType: " + query.getType(i));
+                        EpLog.i("さーびす", "PUT key: " + str + "  getType: " + query.getType(i));
                         query.getType(i);
                         int type = query.getType(i);
                         if (type == 1) {

+ 1 - 1
app/src/main/java/epson/print/screen/SearchPrinterScr.java

@@ -13,7 +13,7 @@ import android.os.Handler;
 import android.os.IBinder;
 import android.os.Message;
 import android.os.RemoteException;
-import android.support.p000v4.app.DialogFragment;
+
 import android.view.ContextMenu;
 import android.view.MenuItem;
 import android.view.View;

+ 1 - 1
app/src/main/java/epson/print/screen/StringListSelectDialog.java

@@ -7,7 +7,7 @@ import android.content.DialogInterface;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
-import android.support.p000v4.app.DialogFragment;
+
 
 public class StringListSelectDialog extends DialogFragment {
     private static final String ARGS_KEY_STRING_LIST = "key-stringList";

+ 3 - 3
app/src/main/java/epson/print/service/EpsonService.java

@@ -192,7 +192,7 @@ public class EpsonService extends Service implements ApfEpImageAdapter.ProgressC
         }
 
         public void setTimeOut(int i) throws RemoteException {
-            EpLog.m70d("EpsonService", "timeout = " + i);
+            EpLog.d("EpsonService", "timeout = " + i);
             int unused = EpsonService.this.timeout_sec = i;
         }
 
@@ -656,7 +656,7 @@ public class EpsonService extends Service implements ApfEpImageAdapter.ProgressC
             boolean z2;
             int i2;
             int i3;
-            EpLog.m70d("EpsonService", "EpsonConnectUpdatePrinterSettings() called.");
+            EpLog.d("EpsonService", "EpsonConnectUpdatePrinterSettings() called.");
             PrintSetting instance = PrintSetting.getInstance(EpsonService.this, str);
             instance.loadSettings();
             int i4 = instance.paperSizeValue;
@@ -1419,7 +1419,7 @@ public class EpsonService extends Service implements ApfEpImageAdapter.ProgressC
                     monitor-enter(r8)
                     java.lang.String r0 = "EpsonService"
                     java.lang.String r1 = "createECPrintingThread() called."
-                    com.epson.mobilephone.common.EpLog.m70d(r0, r1)     // Catch:{ all -> 0x040b }
+                    com.epson.mobilephone.common.EpLog.d(r0, r1)     // Catch:{ all -> 0x040b }
                     epson.print.screen.PrintSetting r0 = new epson.print.screen.PrintSetting     // Catch:{ all -> 0x040b }
                     epson.print.service.EpsonService r1 = epson.print.service.EpsonService.this     // Catch:{ all -> 0x040b }
                     epson.print.screen.PrintSetting$Kind r2 = r2     // Catch:{ all -> 0x040b }

+ 2 - 2
app/src/main/java/epson/support/DeviceInformationActivity.java

@@ -193,12 +193,12 @@ public class DeviceInformationActivity extends ActivityIACommon {
             showLoadProgressBar();
             if (location == 1 || (location == 3 && Utils.isConnectedWifi(getApplicationContext()))) {
                 ManageDefaultNetwork.getInstance(this).setDefaultNetworkSimpleAp();
-                EpLog.m70d("IprintHome", "Update printer status after execute Probing");
+                EpLog.d("IprintHome", "Update printer status after execute Probing");
                 task = new ProbePrinter(curPrinter, mPrinter, mHandler);
                 task.execute(new Context[]{this});
                 return;
             }
-            EpLog.m70d("IprintHome", "Update printer status without execute Probing ");
+            EpLog.d("IprintHome", "Update printer status without execute Probing ");
             sendUpdatePrinterStatus(mHandler, location);
         }
     }

+ 1 - 0
guidelib/.gitignore

@@ -0,0 +1 @@
+/build

+ 37 - 0
guidelib/build.gradle

@@ -0,0 +1,37 @@
+plugins {
+    id 'com.android.library'
+}
+
+android {
+    compileSdkVersion 29
+
+    defaultConfig {
+        minSdkVersion 16
+        targetSdkVersion 29
+        versionCode 1
+        versionName "1.0"
+
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        consumerProguardFiles "consumer-rules.pro"
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+        }
+    }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+}
+
+dependencies {
+
+    implementation 'androidx.appcompat:appcompat:1.2.0'
+    implementation 'com.google.android.material:material:1.2.1'
+    testImplementation 'junit:junit:4.+'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.2'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
+}

+ 0 - 0
guidelib/consumer-rules.pro


+ 21 - 0
guidelib/proguard-rules.pro

@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile

+ 26 - 0
guidelib/src/androidTest/java/com/epson/guidelib/ExampleInstrumentedTest.java

@@ -0,0 +1,26 @@
+package com.epson.guidelib;
+
+import android.content.Context;
+
+import androidx.test.platform.app.InstrumentationRegistry;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import static org.junit.Assert.*;
+
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
+ */
+@RunWith(AndroidJUnit4.class)
+public class ExampleInstrumentedTest {
+    @Test
+    public void useAppContext() {
+        // Context of the app under test.
+        Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
+        assertEquals("com.epson.guidelib.test", appContext.getPackageName());
+    }
+}

+ 5 - 0
guidelib/src/main/AndroidManifest.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.epson.guidelib">
+
+</manifest>

+ 17 - 0
guidelib/src/test/java/com/epson/guidelib/ExampleUnitTest.java

@@ -0,0 +1,17 @@
+package com.epson.guidelib;
+
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+/**
+ * Example local unit test, which will execute on the development machine (host).
+ *
+ * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
+ */
+public class ExampleUnitTest {
+    @Test
+    public void addition_isCorrect() {
+        assertEquals(4, 2 + 2);
+    }
+}

+ 1 - 0
settings.gradle

@@ -1,2 +1,3 @@
+include ':guidelib'
 include ':app'
 rootProject.name = "Print"