liuyuqi-dellpc 3 years ago
parent
commit
de83a4e12b
41 changed files with 439 additions and 430 deletions
  1. 10 10
      app/src/main/java/com/epson/cameracopy/ui/CropImageActivity.java
  2. 2 6
      app/src/main/java/com/epson/iprint/prtlogger/Analytics.java
  3. 1 1
      app/src/main/java/com/epson/iprint/prtlogger/AnalyticsPreferences.java
  4. 1 1
      app/src/main/java/com/epson/memcardacc/EscprLibPrinter.java
  5. 39 39
      app/src/main/java/com/epson/mobilephone/common/ble/BleAsyncTask.java
  6. 11 11
      app/src/main/java/com/epson/mobilephone/common/ble/BleScanWork.java
  7. 102 102
      app/src/main/java/com/epson/mobilephone/common/ble/BleWork.java
  8. 47 47
      app/src/main/java/com/epson/mobilephone/common/ble/BleWorkActivity.java
  9. 3 3
      app/src/main/java/com/epson/mobilephone/common/ble/DeviceAdapter.java
  10. 35 35
      app/src/main/java/com/epson/mobilephone/common/ble/ProbePrinter.java
  11. 2 2
      app/src/main/java/com/epson/mobilephone/common/ble/util/BLEUtility.java
  12. 16 16
      app/src/main/java/com/epson/mobilephone/common/escpr/EscprLib.java
  13. 8 2
      app/src/main/java/com/epson/mobilephone/common/license/InfoDisplayActivity.java
  14. 11 7
      app/src/main/java/com/epson/mobilephone/common/license/LicenseTopActivity.java
  15. 3 0
      app/src/main/java/com/epson/mobilephone/common/license/RestoreScrollView.java
  16. 4 4
      app/src/main/java/com/epson/mobilephone/common/maintain/MaintainPrinter.java
  17. 10 10
      app/src/main/java/com/epson/mobilephone/common/maintain2/MaintainPrinter2.java
  18. 10 10
      app/src/main/java/com/epson/mobilephone/common/usb/UsbPrintDriver.java
  19. 7 7
      app/src/main/java/com/epson/mobilephone/common/usb/UsbPrinter.java
  20. 8 8
      app/src/main/java/com/epson/mobilephone/common/usb/UsbReciever.java
  21. 3 3
      app/src/main/java/epson/epsonconnectregistration/ECAvailableCheckTask.java
  22. 2 2
      app/src/main/java/epson/epsonconnectregistration/ECBaseTask.java
  23. 7 7
      app/src/main/java/epson/epsonconnectregistration/ECConfigurationTask.java
  24. 2 2
      app/src/main/java/epson/epsonconnectregistration/SoapAUTHENTICATIONDataInfo.java
  25. 7 7
      app/src/main/java/epson/epsonconnectregistration/SoapConfigDataParser.java
  26. 17 17
      app/src/main/java/epson/epsonconnectregistration/SoapWEBSETUPDataInfo.java
  27. 1 1
      app/src/main/java/epson/maintain/activity/LogUrl.java
  28. 4 4
      app/src/main/java/epson/maintain/activity/MaintainActivity.java
  29. 7 7
      app/src/main/java/epson/maintain/activity/MaintainPrinterSearchActivity.java
  30. 2 2
      app/src/main/java/epson/print/ActivityViewImageSelect.java
  31. 1 1
      app/src/main/java/epson/print/IprintApplication.java
  32. 11 11
      app/src/main/java/epson/print/IprintHome.java
  33. 1 1
      app/src/main/java/epson/print/WellcomeScreenActivity.java
  34. 3 3
      app/src/main/java/epson/print/ecclient/EpsonConnectAccess.java
  35. 2 2
      app/src/main/java/epson/print/screen/PaperSourceInfo.java
  36. 3 3
      app/src/main/java/epson/print/screen/PrintSetting.java
  37. 2 2
      app/src/main/java/epson/print/screen/SearchPrinterScr.java
  38. 19 19
      app/src/main/java/epson/print/service/EpsonService.java
  39. 1 1
      app/src/main/java/epson/print/service/LocalPrintThread.java
  40. 5 5
      app/src/main/java/epson/provider/SharedPreferencesProvider.java
  41. 9 9
      app/src/main/java/epson/support/DeviceInformationActivity.java

+ 10 - 10
app/src/main/java/com/epson/cameracopy/ui/CropImageActivity.java

@@ -330,9 +330,9 @@ public class CropImageActivity extends ActivityIACommon implements View.OnClickL
             }
             if (str2.equals("do_dismiss")) {
                 cropImageActivity.dismissDialog(str);
-                EpLog.d("dismissDialog");
+                EPLog.d("dismissDialog");
                 if (cropImageActivity.mCropImageMessageShow) {
-                    EpLog.d("TOAST");
+                    EPLog.d("TOAST");
                     cropImageActivity.mCropImageMessageShow = false;
                     cropImageActivity.ToastMessage(cropImageActivity.getString(R.string.crop_image_message));
                 }
@@ -354,19 +354,19 @@ public class CropImageActivity extends ActivityIACommon implements View.OnClickL
 
     public void onPause() {
         super.onPause();
-        EpLog.m68d();
+        EPLog.m68d();
         CancelToast();
     }
 
     public void onStop() {
         super.onStop();
-        EpLog.m68d();
+        EPLog.m68d();
         CancelToast();
     }
 
     private void CancelToast() {
         if (mCustomToast != null) {
-            EpLog.d(" Toast Cancel");
+            EPLog.d(" Toast Cancel");
             mCustomToast.cancel();
             mCustomToast = null;
         }
@@ -775,7 +775,7 @@ public class CropImageActivity extends ActivityIACommon implements View.OnClickL
                 }).start();
                 return;
             case MSG_PREVIEW_LOAD_FINISH /*912*/:
-                EpLog.d("MSG_PREVIEW_LOAD_FINISH");
+                EPLog.d("MSG_PREVIEW_LOAD_FINISH");
                 if (mBitmapPreview != null) {
                     mImageCollectView.SetPreviewBitmapAndCropData(mBitmapPreview, mImageCollect.GetCornerPoints());
                 }
@@ -1222,17 +1222,17 @@ public class CropImageActivity extends ActivityIACommon implements View.OnClickL
         }
 
         public void show() {
-            EpLog.d("show :");
+            EPLog.d("show :");
             if (!mBreak) {
-                EpLog.d("run:show");
+                EPLog.d("run:show");
                 mToast.show();
                 return;
             }
-            EpLog.d("run:break");
+            EPLog.d("run:break");
         }
 
         public void cancel() {
-            EpLog.d("cancel");
+            EPLog.d("cancel");
             mBreak = true;
             mToast.cancel();
         }

+ 2 - 6
app/src/main/java/com/epson/iprint/prtlogger/Analytics.java

@@ -4,11 +4,7 @@ import android.content.Context;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-
-import com.box.androidsdk.content.BoxConstants;
 import com.epson.mobilephone.common.wifidirect.WiFiDirectManager;
-
-
 import epson.print.IprintApplication;
 import epson.print.MyPrinter;
 import epson.print.Util.EPLog;
@@ -208,7 +204,7 @@ public class Analytics {
                 printLog = new PrintLog();
             }
             int printNumber = AnalyticsPreferences.getPrintNumber(context);
-            EpLog.m77i("    **************     " + printNumber);
+            EPLog.i("    **************     " + printNumber);
             if (printNumber > 0) {
                 PrintSetting printSetting = progressParams.getPrintSetting(context);
                 printSetting.loadSettings();
@@ -364,7 +360,7 @@ public class Analytics {
     }
 
     public static void savePrintInfo(@NonNull Context context, int i) {
-        EpLog.m77i("  @@@@@@@@@@@@@     printSheet = " + i);
+        EPLog.i("  @@@@@@@@@@@@@     printSheet = " + i);
         AnalyticsPreferences.savePrintNumber(context, i);
         AnalyticsPreferences.saveConnectionPath(context, getConnectionType(context));
     }

+ 1 - 1
app/src/main/java/com/epson/iprint/prtlogger/AnalyticsPreferences.java

@@ -20,7 +20,7 @@ public class AnalyticsPreferences {
     }
 
     public static void savePrintNumber(@NonNull Context context, int i) {
-        EpLog.m77i("    printNumber = " + i);
+        EPLog.i("    printNumber = " + i);
         SharedPreferencesProvider.getInstace(context, PREFS_NAME).edit().putInt(PREFS_KEY_PRINT_NUMBER, i).apply(PREFS_NAME);
     }
 

+ 1 - 1
app/src/main/java/com/epson/memcardacc/EscprLibPrinter.java

@@ -18,7 +18,7 @@ public class EscprLibPrinter {
     MaintainPrinter2 mMaintainPrinter;
 
     public int init(Context context, int i, boolean z) {
-        EpLog.i();
+        EPLog.i();
         MyPrinter currentPrinter = getCurrentPrinter(context);
         String printerId = currentPrinter.getPrinterId();
         String ip = currentPrinter.getIp();

+ 39 - 39
app/src/main/java/com/epson/mobilephone/common/ble/BleAsyncTask.java

@@ -34,10 +34,10 @@ public class BleAsyncTask extends AsyncTask<Void, Void, Boolean> {
     private Activity m_Activity;
 
     public static void setStop(boolean z) {
-        EpLog.d("mStop   " + z);
+        EPLog.d("mStop   " + z);
         mStop = z;
         if (z) {
-            EpLog.d("★ stopScan");
+            EPLog.d("★ stopScan");
             BleScanWork.getInstace().stopScan();
             if (mTimeOutTask != null) {
                 mTimeOutTask = null;
@@ -55,17 +55,17 @@ public class BleAsyncTask extends AsyncTask<Void, Void, Boolean> {
                 try {
                     BleAsyncTask.this.get(BleAsyncTask.mTimeOut, TimeUnit.MILLISECONDS);
                 } catch (InterruptedException unused) {
-                    EpLog.e("InterruptedException");
+                    EPLog.e("InterruptedException");
                 } catch (ExecutionException unused2) {
-                    EpLog.e("ExecutionException");
+                    EPLog.e("ExecutionException");
                 } catch (TimeoutException unused3) {
-                    EpLog.m77i("Running task has timed out!!");
+                    EPLog.i("Running task has timed out!!");
                     if (BleAsyncTask.mBleWork != null) {
                         BleAsyncTask.mBleWork.stopScan();
                     }
                     BleAsyncTask.mTask.cancel(true);
                 } catch (CancellationException unused4) {
-                    EpLog.e("CancellationException");
+                    EPLog.e("CancellationException");
                 }
             }
         };
@@ -80,17 +80,17 @@ public class BleAsyncTask extends AsyncTask<Void, Void, Boolean> {
                 try {
                     BleAsyncTask.this.get(BleAsyncTask.mTimeOut, TimeUnit.MILLISECONDS);
                 } catch (InterruptedException unused) {
-                    EpLog.e("InterruptedException");
+                    EPLog.e("InterruptedException");
                 } catch (ExecutionException unused2) {
-                    EpLog.e("ExecutionException");
+                    EPLog.e("ExecutionException");
                 } catch (TimeoutException unused3) {
-                    EpLog.m77i("Running task has timed out!!");
+                    EPLog.i("Running task has timed out!!");
                     if (BleAsyncTask.mBleWork != null) {
                         BleAsyncTask.mBleWork.stopScan();
                     }
                     BleAsyncTask.mTask.cancel(true);
                 } catch (CancellationException unused4) {
-                    EpLog.e("CancellationException");
+                    EPLog.e("CancellationException");
                 }
             }
         };
@@ -119,7 +119,7 @@ public class BleAsyncTask extends AsyncTask<Void, Void, Boolean> {
             boolean r0 = mStop
             r5.append(r0)
             java.lang.String r5 = r5.toString()
-            com.epson.mobilephone.common.EpLog.m77i(r5)
+            com.epson.mobilephone.common.EPLog.i(r5)
             boolean r5 = mStop
             if (r5 == 0) goto L_0x001d
             java.lang.Boolean r5 = r4.mFind
@@ -128,10 +128,10 @@ public class BleAsyncTask extends AsyncTask<Void, Void, Boolean> {
             java.lang.Thread r5 = java.lang.Thread.currentThread()
             java.lang.String r0 = "BleAsyncTask"
             r5.setName(r0)
-            com.epson.mobilephone.common.EpLog.m68d()
+            com.epson.mobilephone.common.EPLog.m68d()
             java.lang.Thread r5 = java.lang.Thread.currentThread()
             java.lang.String r5 = r5.getName()
-            com.epson.mobilephone.common.EpLog.m77i(r5)
+            com.epson.mobilephone.common.EPLog.i(r5)
             mTask = r4
             long r0 = r4.mTimeOut
             r2 = 0
@@ -147,12 +147,12 @@ public class BleAsyncTask extends AsyncTask<Void, Void, Boolean> {
             boolean r5 = r5.init_scan(r0)
             if (r5 != 0) goto L_0x005a
             java.lang.String r5 = "BLE is not available !!"
-            com.epson.mobilephone.common.EpLog.m82w(r5)
+            com.epson.mobilephone.common.EPLog.m82w(r5)
             java.lang.Boolean r5 = r4.mFind
             return r5
         L_0x005a:
             java.lang.String r5 = "BLE is available!!"
-            com.epson.mobilephone.common.EpLog.m77i(r5)
+            com.epson.mobilephone.common.EPLog.i(r5)
             com.epson.mobilephone.common.ble.BleScanWork r5 = r4.mBleWork
             com.epson.mobilephone.common.ble.BleAsyncTask$2 r0 = new com.epson.mobilephone.common.ble.BleAsyncTask$2
             r0.<init>()
@@ -169,13 +169,13 @@ public class BleAsyncTask extends AsyncTask<Void, Void, Boolean> {
             boolean r0 = mStop
             r5.append(r0)
             java.lang.String r5 = r5.toString()
-            com.epson.mobilephone.common.EpLog.d(r5)
+            com.epson.mobilephone.common.EPLog.d(r5)
             r0 = 2000(0x7d0, double:9.88E-321)
             java.lang.Thread.sleep(r0)     // Catch:{ InterruptedException -> 0x008e }
             goto L_0x0093
         L_0x008e:
             java.lang.String r5 = "InterruptedException"
-            com.epson.mobilephone.common.EpLog.e((java.lang.String) r5)
+            com.epson.mobilephone.common.EPLog.e((java.lang.String) r5)
         L_0x0093:
             boolean r5 = r4.isCancelled()
             if (r5 != 0) goto L_0x009d
@@ -183,9 +183,9 @@ public class BleAsyncTask extends AsyncTask<Void, Void, Boolean> {
             if (r5 == 0) goto L_0x006e
         L_0x009d:
             java.lang.String r5 = "死にます"
-            com.epson.mobilephone.common.EpLog.d(r5)
+            com.epson.mobilephone.common.EPLog.d(r5)
             java.lang.String r5 = "★ stopScan"
-            com.epson.mobilephone.common.EpLog.d(r5)
+            com.epson.mobilephone.common.EPLog.d(r5)
             com.epson.mobilephone.common.ble.BleScanWork r5 = r4.mBleWork
             r5.stopScan()
         L_0x00ac:
@@ -196,7 +196,7 @@ public class BleAsyncTask extends AsyncTask<Void, Void, Boolean> {
             java.lang.Boolean r0 = r4.mFind
             r5.append(r0)
             java.lang.String r5 = r5.toString()
-            com.epson.mobilephone.common.EpLog.d(r5)
+            com.epson.mobilephone.common.EPLog.d(r5)
             java.lang.Boolean r5 = r4.mFind
             return r5
         */
@@ -205,7 +205,7 @@ public class BleAsyncTask extends AsyncTask<Void, Void, Boolean> {
 
     protected void onPostExecute(Boolean bool) {
         super.onPostExecute(bool);
-        EpLog.d("" + bool);
+        EPLog.d("" + bool);
     }
 
     private void showAdvanceToSettingDialog() {
@@ -215,13 +215,13 @@ public class BleAsyncTask extends AsyncTask<Void, Void, Boolean> {
             for (ScannedDevice next : mDevicelist) {
                 arrayList.add(new ScannedDevice(next.getDevice(), next.getRssi(), next.getDisplayName(), next.getHardwareType()));
             }
-            EpLog.d(" ★ mDevicelist " + arrayList.size());
+            EPLog.d(" ★ mDevicelist " + arrayList.size());
             mCallBack.call(arrayList);
             return;
         }
         dialog = new AlertDialog.Builder(m_Activity).setCancelable(false).setMessage(m_Activity.getString(R.string.BLE_find_unconfigured_printer_title)).setPositiveButton(m_Activity.getString(R.string.BLE_find_unconfigured_printer_setup_button), new DialogInterface.OnClickListener() {
             public void onClick(DialogInterface dialogInterface, int i) {
-                EpLog.d("★ stopScan");
+                EPLog.d("★ stopScan");
                 BleAsyncTask.mBleWork.stopScan();
                 BleAsyncTask bleAsyncTask = BleAsyncTask.this;
                 List unused = bleAsyncTask.mDevicelist = bleAsyncTask.mBleWork.getScannedDeviceList();
@@ -235,7 +235,7 @@ public class BleAsyncTask extends AsyncTask<Void, Void, Boolean> {
             }
         }).setNegativeButton(m_Activity.getString(R.string.BLE_find_unconfigured_printer_not_now_button), new DialogInterface.OnClickListener() {
             public void onClick(DialogInterface dialogInterface, int i) {
-                EpLog.d("★ stopScan");
+                EPLog.d("★ stopScan");
                 BleAsyncTask.mBleWork.stopScan();
                 BleAsyncTask.setStop(true);
             }
@@ -245,7 +245,7 @@ public class BleAsyncTask extends AsyncTask<Void, Void, Boolean> {
 
     protected void onCancelled(Boolean bool) {
         super.onCancelled(bool);
-        EpLog.d("死にました。  " + bool);
+        EPLog.d("死にました。  " + bool);
     }
 
     protected void onCancelled() {
@@ -259,21 +259,21 @@ public class BleAsyncTask extends AsyncTask<Void, Void, Boolean> {
 
     public static void blePrinterCheck(Context context) {
         setStop(false);
-        EpLog.i();
+        EPLog.i();
         AlertDialog alertDialog = dialog;
         if (alertDialog == null || !alertDialog.isShowing()) {
             final Activity activity = (Activity) context;
             if (BLEUtility.isThreadAlive("bleCheck")) {
-                EpLog.d("isAlive bleCheck");
+                EPLog.d("isAlive bleCheck");
             } else if (handlerThread != null) {
-                EpLog.e("handlerThread != null   ");
+                EPLog.e("handlerThread != null   ");
             } else {
-                EpLog.m77i("★     handlerThread start   ");
+                EPLog.i("★     handlerThread start   ");
                 handlerThread = new HandlerThread("bleCheck");
                 handlerThread.start();
                 new Handler(handlerThread.getLooper()).postDelayed(new Runnable() {
                     public void run() {
-                        EpLog.m77i(" 0 handlerThread run !!!!");
+                        EPLog.i(" 0 handlerThread run !!!!");
                         BleAsyncTask.handlerThread.quitSafely();
                         new BleAsyncTask(activity).execute(new Void[0]);
                     }
@@ -284,18 +284,18 @@ public class BleAsyncTask extends AsyncTask<Void, Void, Boolean> {
 
     public static void blePrinterCheck(Context context, final BLEUtility.BleWorkCallback bleWorkCallback) {
         setStop(false);
-        EpLog.i();
+        EPLog.i();
         final Activity activity = (Activity) context;
         if (BLEUtility.isThreadAlive("bleCheck")) {
-            EpLog.d("   ‼ isAlive bleCheck");
+            EPLog.d("   ‼ isAlive bleCheck");
             return;
         }
-        EpLog.m77i("handlerThread");
+        EPLog.i("handlerThread");
         handlerThread = new HandlerThread("bleCheck");
         handlerThread.start();
         new Handler(handlerThread.getLooper()).postDelayed(new Runnable() {
             public void run() {
-                EpLog.m77i(" handlerThread run !!!!");
+                EPLog.i(" handlerThread run !!!!");
                 BleAsyncTask.handlerThread.quitSafely();
                 new BleAsyncTask(activity, bleWorkCallback, BleWork.getScanAdvertisingPacketTimeout()).execute(new Void[0]);
             }
@@ -303,7 +303,7 @@ public class BleAsyncTask extends AsyncTask<Void, Void, Boolean> {
     }
 
     public static void blePrinterCheckStop() {
-        EpLog.i();
+        EPLog.i();
         if (handlerThread != null) {
             setStop(true);
             handlerThread.quitSafely();
@@ -314,17 +314,17 @@ public class BleAsyncTask extends AsyncTask<Void, Void, Boolean> {
             }
             Thread thread = BLEUtility.getThread("bleCheck");
             if (thread != null && thread.isAlive()) {
-                EpLog.m77i("interrupt");
+                EPLog.i("interrupt");
                 thread.interrupt();
                 try {
-                    EpLog.m77i("join");
+                    EPLog.i("join");
                     thread.join(50);
                 } catch (InterruptedException e) {
-                    EpLog.e(e.getMessage());
+                    EPLog.e(e.getMessage());
                 }
             }
         } else {
-            EpLog.m77i("handlerThread NULL return !!");
+            EPLog.i("handlerThread NULL return !!");
         }
     }
 }

+ 11 - 11
app/src/main/java/com/epson/mobilephone/common/ble/BleScanWork.java

@@ -68,7 +68,7 @@ public class BleScanWork {
                 public void onScanResult(int i, @NonNull ScanResult scanResult) {
                     ScanRecord scanRecord = scanResult.getScanRecord();
                     if (scanRecord == null) {
-                        EpLog.e("scanRecord is NULL !!");
+                        EPLog.e("scanRecord is NULL !!");
                         return;
                     }
                     SparseArray<byte[]> manufacturerSpecificData = scanRecord.getManufacturerSpecificData();
@@ -81,7 +81,7 @@ public class BleScanWork {
                             }
                             String deviceName = getDeviceName(scanResult);
                             if (deviceName != null && !deviceName.isEmpty() && scanResult.getRssi() >= -75 && scanResult.getRssi() < 127 && BleScanWork.this.update(scanResult.getDevice(), scanResult.getRssi(), deviceName, valueAt) && BleScanWork.mScannedDeviceList.size() > 0 && BleScanWork.mSuccess != null) {
-                                EpLog.e("mScannedDeviceList --- " + BleScanWork.mScannedDeviceList.size());
+                                EPLog.e("mScannedDeviceList --- " + BleScanWork.mScannedDeviceList.size());
                                 BleScanWork.mSuccess.call(BleScanWork.mScannedDeviceList);
                                 return;
                             }
@@ -91,7 +91,7 @@ public class BleScanWork {
                 }
 
                 public void onScanFailed(int i) {
-                    EpLog.e("onScanFailed " + i);
+                    EPLog.e("onScanFailed " + i);
                 }
 
                 @Nullable
@@ -122,9 +122,9 @@ public class BleScanWork {
                     String name = bluetoothDevice.getName();
                     byte[] bArr2 = new byte[3];
                     System.arraycopy(bArr, 7, bArr2, 0, bArr2.length);
-                    EpLog.d(name + " Company information = " + sb2 + " getManufacturerSpecificData = " + sb3);
+                    EPLog.d(name + " Company information = " + sb2 + " getManufacturerSpecificData = " + sb3);
                     if (BleScanWork.this.update(bluetoothDevice, i, name, bArr2) && BleScanWork.mSuccess != null && name != null) {
-                        EpLog.e("mScannedDeviceList --- " + BleScanWork.mScannedDeviceList.size());
+                        EPLog.e("mScannedDeviceList --- " + BleScanWork.mScannedDeviceList.size());
                         BleScanWork.mSuccess.call(BleScanWork.mScannedDeviceList);
                     }
                 }
@@ -165,7 +165,7 @@ public class BleScanWork {
             return false;
         }
         mScannedDeviceList.add(new ScannedDevice(bluetoothDevice, i, str, bArr));
-        EpLog.m77i("☆☆ = " + str + ":" + i);
+        EPLog.i("☆☆ = " + str + ":" + i);
         return true;
     }
 
@@ -188,13 +188,13 @@ public class BleScanWork {
             }
         }
         stopScan();
-        EpLog.d("★ stopScan");
+        EPLog.d("★ stopScan");
         return true;
     }
 
     private void startScan(boolean z) {
         ScanSettings scanSettings;
-        EpLog.m77i("☆startScan☆");
+        EPLog.i("☆startScan☆");
         mScannedDeviceList.clear();
         mIsFiltering = z;
         if (mBTAdapter != null && !mIsScanning) {
@@ -218,20 +218,20 @@ public class BleScanWork {
     }
 
     public void stopScan() {
-        EpLog.m77i("stopScan");
+        EPLog.i("stopScan");
         if (mBTAdapter == null) {
             return;
         }
         if (Build.VERSION.SDK_INT < 21) {
             mBTAdapter.stopLeScan(mLeScanCallback);
-            EpLog.m77i("mLeScanCallback");
+            EPLog.i("mLeScanCallback");
             mIsScanning = false;
             return;
         }
         BluetoothLeScanner bluetoothLeScanner = mBluetoothLeScanner;
         if (bluetoothLeScanner != null) {
             bluetoothLeScanner.stopScan(mScanCallback);
-            EpLog.m77i("mScanCallback");
+            EPLog.i("mScanCallback");
             mIsScanning = false;
         }
     }

+ 102 - 102
app/src/main/java/com/epson/mobilephone/common/ble/BleWork.java

@@ -190,12 +190,12 @@ public class BleWork {
         mSequence = jobSequence.UNINITIALIZED;
         mGattcallback = null;
         if (mGattcallback != null) {
-            EpLog.e("mGattcallback != null");
+            EPLog.e("mGattcallback != null");
         }
         mGattcallback = new BluetoothGattCallback() {
             public void onMtuChanged(BluetoothGatt bluetoothGatt, int i, int i2) {
                 super.onMtuChanged(bluetoothGatt, i, i2);
-                EpLog.m77i("onMtuChanged " + i);
+                EPLog.i("onMtuChanged " + i);
             }
 
             public void onDescriptorWrite(BluetoothGatt bluetoothGatt, BluetoothGattDescriptor bluetoothGattDescriptor, int i) {
@@ -209,37 +209,37 @@ public class BleWork {
             }
 
             public void onConnectionStateChange(BluetoothGatt bluetoothGatt, int i, int i2) {
-                EpLog.m77i("status = " + i + "  newState = " + i2);
+                EPLog.i("status = " + i + "  newState = " + i2);
                 if (i == 0 && i2 == 2) {
-                    EpLog.m77i("STATE_CONNECTED  -- " + BleWork.mSequence);
+                    EPLog.i("STATE_CONNECTED  -- " + BleWork.mSequence);
                     BleWork bleWork = BleWork.this;
                     bleWork.mStatus = i2;
                     if (bleWork.mConnGatt == null) {
-                        EpLog.e("mConnGatt  NULL !");
+                        EPLog.e("mConnGatt  NULL !");
                     }
                     if (bluetoothGatt == null) {
-                        EpLog.e("gatt  NULL !");
+                        EPLog.e("gatt  NULL !");
                     }
                     BluetoothGatt unused = BleWork.mConnGatt = bluetoothGatt;
                     BleWork.this.handlerWrite.removeCallbacks((Runnable) null);
                     BleWork.this.handlerWrite.postDelayed(new Runnable() {
                         public void run() {
-                            EpLog.m77i("discoverServices");
+                            EPLog.i("discoverServices");
                             try {
                                 if (!((BluetoothGatt) Objects.requireNonNull(BleWork.mConnGatt)).discoverServices()) {
-                                    EpLog.e("discoverServices error");
+                                    EPLog.e("discoverServices error");
                                 }
                             } catch (NullPointerException unused) {
-                                EpLog.e("mConnGatt NULL !");
+                                EPLog.e("mConnGatt NULL !");
                             }
                         }
                     }, 500);
                 } else if (i != 0 || i2 == 0) {
-                    EpLog.m77i("STATE_DISCONNECTED " + BleWork.mSequence + " mReconnect = " + BleWork.mReconnect + " mRetry  " + BleWork.mRetry);
+                    EPLog.i("STATE_DISCONNECTED " + BleWork.mSequence + " mReconnect = " + BleWork.mReconnect + " mRetry  " + BleWork.mRetry);
                     if (!BleWork.mReconnect && BleWork.mSequence == jobSequence.UNINITIALIZED) {
                         BleWork.this.failedProcessing();
                     } else if (BleWork.mReconnect || BleWork.mSequence == jobSequence.UNINITIALIZED || BleWork.mSequence == jobSequence.MIB_REBOOT_NW || BleWork.mSequence == jobSequence.DISCONNECTED || BleWork.mSequence == jobSequence.MIB_SET_SSID || BleWork.mSequence == jobSequence.AFTER_SETTING_PASSWORD) {
-                        EpLog.d("★ stopScan");
+                        EPLog.d("★ stopScan");
                         BleScanWork.getInstace().stopScan();
                         BleWork bleWork2 = BleWork.this;
                         bleWork2.mStatus = i2;
@@ -247,7 +247,7 @@ public class BleWork {
                             if (BleWork.mSequence == jobSequence.MIB_REBOOT_NW) {
                                 BleWork.this.gattClose();
                             }
-                            EpLog.m77i(" BREAK ★ mSequence " + BleWork.mSequence);
+                            EPLog.i(" BREAK ★ mSequence " + BleWork.mSequence);
                             return;
                         }
                         BleWork.this.gattClose();
@@ -260,9 +260,9 @@ public class BleWork {
                             } catch (InterruptedException e) {
                                 e.printStackTrace();
                             }
-                            EpLog.m82w("retry " + BleWork.mRetry);
+                            EPLog.m82w("retry " + BleWork.mRetry);
                             BleWork.access$508(BleWork.this);
-                            EpLog.e("init");
+                            EPLog.e("init");
                             boolean unused2 = BleWork.this.init();
                             return;
                         }
@@ -271,20 +271,20 @@ public class BleWork {
                         BleWork.this.failedProcessing();
                     }
                 } else if (i2 == 1) {
-                    EpLog.m77i("STATE_CONNECTING");
+                    EPLog.i("STATE_CONNECTING");
                 } else if (i2 == 3) {
-                    EpLog.m77i("STATE_DISCONNECTING");
+                    EPLog.i("STATE_DISCONNECTING");
                 }
             }
 
             public void onServicesDiscovered(BluetoothGatt bluetoothGatt, int i) {
-                EpLog.i();
+                EPLog.i();
                 try {
                     for (BluetoothGattService next : bluetoothGatt.getServices()) {
                         if (next != null) {
                             if (next.getUuid() != null) {
                                 if (BLEUuid.SERVICE_SNMP.equalsIgnoreCase(next.getUuid().toString())) {
-                                    EpLog.m77i("発見!! EPSON SNMP サービス");
+                                    EPLog.i("発見!! EPSON SNMP サービス");
                                     for (Map.Entry next2 : BLEUuid.GattCharsMap.entrySet()) {
                                         next2.setValue(next.getCharacteristic(UUID.fromString((String) next2.getKey())));
                                     }
@@ -302,7 +302,7 @@ public class BleWork {
                         }
                     }
                 } catch (BleException e) {
-                    EpLog.e(e.getMessage());
+                    EPLog.e(e.getMessage());
                     e.printStackTrace();
                     BleWork.this.failedProcessing();
                 }
@@ -310,22 +310,22 @@ public class BleWork {
 
             public void onCharacteristicChanged(BluetoothGatt bluetoothGatt, @NonNull BluetoothGattCharacteristic bluetoothGattCharacteristic) {
                 super.onCharacteristicChanged(bluetoothGatt, bluetoothGattCharacteristic);
-                EpLog.d("onCharacteristicChanged");
+                EPLog.d("onCharacteristicChanged");
                 if (BLEUuid.CHAR_SNMP_STATUS_STRING.equals(bluetoothGattCharacteristic.getUuid().toString())) {
                     Short valueOf = Short.valueOf(bluetoothGattCharacteristic.getIntValue(17, 0).shortValue());
                     String sh = valueOf.toString();
                     if (valueOf.shortValue() == 0) {
-                        EpLog.m77i("[Notify]SNMP Status" + sh);
+                        EPLog.i("[Notify]SNMP Status" + sh);
                         BleWork.this.characteristicRead();
                         return;
                     }
-                    EpLog.e("[Notify]SNMP Status" + sh);
+                    EPLog.e("[Notify]SNMP Status" + sh);
                     BleWork.this.failedProcessing();
                 } else if (BLEUuid.CHAR_SECURITY_TYPE_STRING.equals(bluetoothGattCharacteristic.getUuid().toString())) {
                     Short valueOf2 = Short.valueOf(bluetoothGattCharacteristic.getIntValue(17, 0).shortValue());
                     BleWork.this.setSecurityType(valueOf2.shortValue());
                     String sh2 = valueOf2.toString();
-                    EpLog.m77i("[Notify]Security Type " + sh2);
+                    EPLog.i("[Notify]Security Type " + sh2);
                     if (valueOf2.shortValue() <= 0) {
                         BleWork.mSsidLis.clear();
                         BleWork.this.getSSIDList();
@@ -334,7 +334,7 @@ public class BleWork {
                     }
                 } else {
                     String sh3 = Short.valueOf(bluetoothGattCharacteristic.getIntValue(17, 0).shortValue()).toString();
-                    EpLog.e("[Notify]unKnown type" + sh3);
+                    EPLog.e("[Notify]unKnown type" + sh3);
                 }
             }
 
@@ -356,7 +356,7 @@ public class BleWork {
                     java.lang.String r0 = r0.toString()
                     if (r0 != 0) goto L_0x0011
                     java.lang.String r7 = "characteristic NULL !!"
-                    com.epson.mobilephone.common.EpLog.e((java.lang.String) r7)
+                    com.epson.mobilephone.common.EPLog.e((java.lang.String) r7)
                     goto L_0x03a1
                 L_0x0011:
                     java.lang.String r0 = r0.toLowerCase()
@@ -452,7 +452,7 @@ public class BleWork {
                     boolean r0 = r7.isEmpty()
                     if (r0 == 0) goto L_0x00c3
                     java.lang.String r7 = "[Read]SNMP Response :end!"
-                    com.epson.mobilephone.common.EpLog.m77i(r7)
+                    com.epson.mobilephone.common.EPLog.i(r7)
                     com.epson.mobilephone.common.ble.BleWork r7 = com.epson.mobilephone.common.ble.BleWork.this
                     boolean unused = r7.mInSequence = r4
                     com.epson.mobilephone.common.ble.BleWork r7 = com.epson.mobilephone.common.ble.BleWork.this
@@ -470,7 +470,7 @@ public class BleWork {
                     r0.append(r1)
                     r0.append(r7)
                     java.lang.String r0 = r0.toString()
-                    com.epson.mobilephone.common.EpLog.m77i(r0)
+                    com.epson.mobilephone.common.EPLog.i(r0)
                     com.epson.mobilephone.common.ble.BleWork r0 = com.epson.mobilephone.common.ble.BleWork.this
                     java.util.List r0 = r0.mSsidLis
                     r0.add(r7)
@@ -486,7 +486,7 @@ public class BleWork {
                     com.epson.mobilephone.common.ble.BleWork$jobSequence r0 = r0.mSequence
                     r7.append(r0)
                     java.lang.String r7 = r7.toString()
-                    com.epson.mobilephone.common.EpLog.m77i(r7)
+                    com.epson.mobilephone.common.EPLog.i(r7)
                     int[] r7 = com.epson.mobilephone.common.ble.BleWork.C10195.$SwitchMap$com$epson$mobilephone$common$ble$BleWork$jobSequence
                     com.epson.mobilephone.common.ble.BleWork r0 = com.epson.mobilephone.common.ble.BleWork.this
                     com.epson.mobilephone.common.ble.BleWork$jobSequence r0 = r0.mSequence
@@ -526,7 +526,7 @@ public class BleWork {
                     r7 = r7[r4]
                     r0.append(r7)
                     java.lang.String r7 = r0.toString()
-                    com.epson.mobilephone.common.EpLog.m77i(r7)
+                    com.epson.mobilephone.common.EPLog.i(r7)
                     com.epson.mobilephone.common.ble.BleWork r7 = com.epson.mobilephone.common.ble.BleWork.this
                     com.epson.mobilephone.common.ble.BleWork$jobSequence r7 = r7.mSequence
                     com.epson.mobilephone.common.ble.BleWork$jobSequence r0 = com.epson.mobilephone.common.ble.BleWork.jobSequence.MIB_SEC_SKIP
@@ -553,7 +553,7 @@ public class BleWork {
                     com.epson.mobilephone.common.ble.BleWork$jobSequence r0 = r0.mSequence
                     r7.append(r0)
                     java.lang.String r7 = r7.toString()
-                    com.epson.mobilephone.common.EpLog.m77i(r7)
+                    com.epson.mobilephone.common.EPLog.i(r7)
                     com.epson.mobilephone.common.ble.BleWork r7 = com.epson.mobilephone.common.ble.BleWork.this
                     com.epson.mobilephone.common.ble.BleWork$jobSequence r7 = r7.mSequence
                     int r7 = r7.ordinal()
@@ -565,7 +565,7 @@ public class BleWork {
                     goto L_0x03a1
                 L_0x0198:
                     java.lang.String r7 = "[Read]SNMP Response :error "
-                    com.epson.mobilephone.common.EpLog.e((java.lang.String) r7)
+                    com.epson.mobilephone.common.EPLog.e((java.lang.String) r7)
                     goto L_0x03a1
                 L_0x019f:
                     java.lang.StringBuilder r7 = new java.lang.StringBuilder
@@ -578,7 +578,7 @@ public class BleWork {
                     int r0 = r0.requestId
                     r7.append(r0)
                     java.lang.String r7 = r7.toString()
-                    com.epson.mobilephone.common.EpLog.d(r7)
+                    com.epson.mobilephone.common.EPLog.d(r7)
                     com.epson.mobilephone.common.ble.BleWork r7 = com.epson.mobilephone.common.ble.BleWork.this
                     com.epson.mobilephone.common.escpr.EscprLib r7 = r7.mEscprlib
                     com.epson.mobilephone.common.ble.BleWork r0 = com.epson.mobilephone.common.ble.BleWork.this
@@ -597,10 +597,10 @@ public class BleWork {
                     r0.append(r1)
                     r0.append(r7)
                     java.lang.String r0 = r0.toString()
-                    com.epson.mobilephone.common.EpLog.m77i(r0)
+                    com.epson.mobilephone.common.EPLog.i(r0)
                     if (r7 == 0) goto L_0x01fc
                     java.lang.String r7 = "[Read]SNMP Response :end!"
-                    com.epson.mobilephone.common.EpLog.m77i(r7)
+                    com.epson.mobilephone.common.EPLog.i(r7)
                     goto L_0x03a1
                 L_0x01fc:
                     r6.IncrementSequence()
@@ -615,7 +615,7 @@ public class BleWork {
                     com.epson.mobilephone.common.ble.BleWork$jobSequence r7 = r7.mSequence
                     r0.append(r7)
                     java.lang.String r7 = r0.toString()
-                    com.epson.mobilephone.common.EpLog.m77i(r7)
+                    com.epson.mobilephone.common.EPLog.i(r7)
                     com.epson.mobilephone.common.ble.BleWork r7 = com.epson.mobilephone.common.ble.BleWork.this
                     r7.setSSIDWork()
                     goto L_0x03a1
@@ -629,7 +629,7 @@ public class BleWork {
                     r0 = r0 ^ r3
                     if (r0 != 0) goto L_0x0244
                     java.lang.String r7 = "[Read]SNMP Response :end!"
-                    com.epson.mobilephone.common.EpLog.m77i(r7)
+                    com.epson.mobilephone.common.EPLog.i(r7)
                     goto L_0x03a1
                 L_0x0244:
                     r6.IncrementSequence()
@@ -644,7 +644,7 @@ public class BleWork {
                     com.epson.mobilephone.common.ble.BleWork$jobSequence r7 = r7.mSequence
                     r0.append(r7)
                     java.lang.String r7 = r0.toString()
-                    com.epson.mobilephone.common.EpLog.m77i(r7)
+                    com.epson.mobilephone.common.EPLog.i(r7)
                     com.epson.mobilephone.common.ble.BleWork r7 = com.epson.mobilephone.common.ble.BleWork.this
                     r7.setSSIDWork()
                     goto L_0x03a1
@@ -672,13 +672,13 @@ public class BleWork {
                     com.epson.mobilephone.common.ble.BleWork$jobSequence r7 = r7.mSequence
                     r0.append(r7)
                     java.lang.String r7 = r0.toString()
-                    com.epson.mobilephone.common.EpLog.m77i(r7)
+                    com.epson.mobilephone.common.EPLog.i(r7)
                     com.epson.mobilephone.common.ble.BleWork r7 = com.epson.mobilephone.common.ble.BleWork.this
                     r7.setSSIDWork()
                     goto L_0x03a1
                 L_0x02b6:
                     java.lang.String r7 = "[Read]SNMP Response :failed"
-                    com.epson.mobilephone.common.EpLog.e((java.lang.String) r7)
+                    com.epson.mobilephone.common.EPLog.e((java.lang.String) r7)
                     goto L_0x03a1
                 L_0x02bd:
                     java.lang.Integer r7 = r7.getIntValue(r1, r4)
@@ -689,7 +689,7 @@ public class BleWork {
                     r0.append(r1)
                     r0.append(r7)
                     java.lang.String r7 = r0.toString()
-                    com.epson.mobilephone.common.EpLog.m77i(r7)
+                    com.epson.mobilephone.common.EPLog.i(r7)
                     com.epson.mobilephone.common.ble.BleWork r7 = com.epson.mobilephone.common.ble.BleWork.this
                     java.lang.String r7 = r7.mSSID
                     if (r7 == 0) goto L_0x03a1
@@ -699,19 +699,19 @@ public class BleWork {
                     if (r7 != 0) goto L_0x03a1
                     r6.IncrementSequence()
                     java.lang.String r7 = " @@  checkSSID  @@ "
-                    com.epson.mobilephone.common.EpLog.d(r7)
+                    com.epson.mobilephone.common.EPLog.d(r7)
                     com.epson.mobilephone.common.ble.BleWork r7 = com.epson.mobilephone.common.ble.BleWork.this
                     android.bluetooth.BluetoothGatt r7 = r7.mConnGatt
                     if (r7 != 0) goto L_0x0302
                     java.lang.String r7 = "mConnGatt  NULL !"
-                    com.epson.mobilephone.common.EpLog.e((java.lang.String) r7)
+                    com.epson.mobilephone.common.EPLog.e((java.lang.String) r7)
                 L_0x0302:
                     com.epson.mobilephone.common.ble.BleWork r7 = com.epson.mobilephone.common.ble.BleWork.this
                     short r7 = r7.getSecurityType()
                     r0 = 255(0xff, float:3.57E-43)
                     if (r7 != r0) goto L_0x0328
                     java.lang.String r7 = " skip  "
-                    com.epson.mobilephone.common.EpLog.d(r7)
+                    com.epson.mobilephone.common.EPLog.d(r7)
                     com.epson.mobilephone.common.ble.BleWork r7 = com.epson.mobilephone.common.ble.BleWork.this
                     com.epson.mobilephone.common.ble.util.BLEUtility$BleWorkCallback r7 = r7.mSequenceCallbackSuccess
                     if (r7 == 0) goto L_0x03a1
@@ -736,12 +736,12 @@ public class BleWork {
                     r1.append(r2)
                     r1.append(r0)
                     java.lang.String r0 = r1.toString()
-                    com.epson.mobilephone.common.EpLog.m77i(r0)
+                    com.epson.mobilephone.common.EPLog.i(r0)
                     short r7 = r7.shortValue()
                     r0 = 65535(0xffff, float:9.1834E-41)
                     if (r7 != r0) goto L_0x0367
                     java.lang.String r7 = "password error !"
-                    com.epson.mobilephone.common.EpLog.e((java.lang.String) r7)
+                    com.epson.mobilephone.common.EPLog.e((java.lang.String) r7)
                     com.epson.mobilephone.common.ble.BleWork r7 = com.epson.mobilephone.common.ble.BleWork.this
                     com.epson.mobilephone.common.ble.BleWork$jobSequence r0 = com.epson.mobilephone.common.ble.BleWork.jobSequence.FAILED
                     r7.mSequence = r0
@@ -759,7 +759,7 @@ public class BleWork {
                     r0.append(r1)
                     r0.append(r7)
                     java.lang.String r7 = r0.toString()
-                    com.epson.mobilephone.common.EpLog.m77i(r7)
+                    com.epson.mobilephone.common.EPLog.i(r7)
                     goto L_0x03a1
                 L_0x0389:
                     java.lang.String r7 = r7.getStringValue(r4)
@@ -769,7 +769,7 @@ public class BleWork {
                     r0.append(r1)
                     r0.append(r7)
                     java.lang.String r7 = r0.toString()
-                    com.epson.mobilephone.common.EpLog.m77i(r7)
+                    com.epson.mobilephone.common.EPLog.i(r7)
                 L_0x03a1:
                     return
                 */
@@ -780,7 +780,7 @@ public class BleWork {
                 int ordinal = BleWork.mSequence.ordinal();
                 jobSequence[] values = jobSequence.values();
                 BleWork.mSequence = values[ordinal + 1];
-                EpLog.m77i("ΔΔ mSequence = " + BleWork.mSequence);
+                EPLog.i("ΔΔ mSequence = " + BleWork.mSequence);
             }
 
             public void onCharacteristicWrite(BluetoothGatt bluetoothGatt, BluetoothGattCharacteristic bluetoothGattCharacteristic, int i) {
@@ -805,13 +805,13 @@ public class BleWork {
 
             private void notifySet(@NonNull BluetoothGattCharacteristic bluetoothGattCharacteristic) {
                 if (!BleWork.mConnGatt.setCharacteristicNotification(bluetoothGattCharacteristic, true)) {
-                    EpLog.e("Notification set ERROR");
+                    EPLog.e("Notification set ERROR");
                 }
                 BluetoothGattDescriptor descriptor = bluetoothGattCharacteristic.getDescriptor(UUID.fromString(BLEUuid.CLIENT_CHARACTERISTIC_CONFIG));
                 descriptor.setValue(BluetoothGattDescriptor.ENABLE_NOTIFICATION_VALUE);
-                EpLog.m77i("notify set");
+                EPLog.i("notify set");
                 if (!BleWork.mConnGatt.writeDescriptor(descriptor)) {
-                    EpLog.e("Notification write ERROR");
+                    EPLog.e("Notification write ERROR");
                 }
             }
         };
@@ -843,7 +843,7 @@ public class BleWork {
     @NonNull
     public static String getSSID(@NonNull Context context) {
         String curSSID = WiFiDirectManager.getCurSSID(context);
-        EpLog.m77i("" + curSSID);
+        EPLog.i("" + curSSID);
         return (curSSID == null || curSSID.equals("<unknown ssid>")) ? "" : curSSID;
     }
 
@@ -883,15 +883,15 @@ public class BleWork {
     }
 
     public void disconnect(boolean z) {
-        EpLog.m77i("mSequence == " + mSequence + ":: " + mStatus);
+        EPLog.i("mSequence == " + mSequence + ":: " + mStatus);
         mSequence = z ? jobSequence.DISCONNECTED : mSequence;
         if (mConnGatt != null) {
             int i = mStatus;
             if (!(i == 3 || i == 0)) {
-                EpLog.d(" !! mConnGatt disconnect");
+                EPLog.d(" !! mConnGatt disconnect");
                 mConnGatt.disconnect();
             }
-            EpLog.d(" !! mConnGatt close " + mSequence + " " + mStatus);
+            EPLog.d(" !! mConnGatt close " + mSequence + " " + mStatus);
             mReconnect = false;
             if (z) {
                 gattClose();
@@ -900,7 +900,7 @@ public class BleWork {
     }
 
     private void gattClose() {
-        EpLog.d(" !! mConnGatt close");
+        EPLog.d(" !! mConnGatt close");
         BluetoothGatt bluetoothGatt = mConnGatt;
         if (bluetoothGatt != null) {
             bluetoothGatt.close();
@@ -913,10 +913,10 @@ public class BleWork {
     }
 
     public void connect() {
-        EpLog.m77i("再接続");
+        EPLog.i("再接続");
         mReconnect = true;
         mRetry = 0;
-        EpLog.e("init");
+        EPLog.e("init");
         init();
     }
 
@@ -930,13 +930,13 @@ public class BleWork {
 
     private void notifySet(@NonNull BluetoothGattCharacteristic bluetoothGattCharacteristic) {
         if (!mConnGatt.setCharacteristicNotification(bluetoothGattCharacteristic, true)) {
-            EpLog.e("Notification set ERROR");
+            EPLog.e("Notification set ERROR");
         }
         BluetoothGattDescriptor descriptor = bluetoothGattCharacteristic.getDescriptor(UUID.fromString(BLEUuid.CLIENT_CHARACTERISTIC_CONFIG));
         descriptor.setValue(BluetoothGattDescriptor.ENABLE_NOTIFICATION_VALUE);
-        EpLog.m77i("notify set");
+        EPLog.i("notify set");
         if (!mConnGatt.writeDescriptor(descriptor)) {
-            EpLog.e(" writeDescriptor ERROR");
+            EPLog.e(" writeDescriptor ERROR");
         }
     }
 
@@ -951,7 +951,7 @@ public class BleWork {
 
         protected void onPreExecute() {
             super.onPreExecute();
-            EpLog.i();
+            EPLog.i();
             try {
                 Thread.sleep(500);
             } catch (InterruptedException e) {
@@ -959,7 +959,7 @@ public class BleWork {
             }
             BleWork.this.setNotifyCallback(new BLEUtility.BleWorkCallback() {
                 public void call(@NonNull Object obj) {
-                    EpLog.m77i(" -- NotifySetThread call");
+                    EPLog.i(" -- NotifySetThread call");
                     BluetoothGattCharacteristic bluetoothGattCharacteristic = BLEUuid.GattCharsMap.get(BLEUuid.CHAR_SECURITY_TYPE_STRING);
                     BluetoothGattCharacteristic bluetoothGattCharacteristic2 = BLEUuid.GattCharsMap.get(BLEUuid.CHAR_SNMP_STATUS_STRING);
                     BluetoothGattDescriptor bluetoothGattDescriptor = (BluetoothGattDescriptor) obj;
@@ -990,12 +990,12 @@ public class BleWork {
                     }
                 }
                 if (this.stop) {
-                    EpLog.m77i(" set ended ");
-                    EpLog.i();
+                    EPLog.i(" set ended ");
+                    EPLog.i();
                     return Boolean.valueOf(this.success);
                 }
             }
-            EpLog.e(" set failed! ");
+            EPLog.e(" set failed! ");
             return false;
         }
 
@@ -1011,13 +1011,13 @@ public class BleWork {
                 BleWork.this.checkPassword();
                 return;
             }
-            EpLog.e("setNotify");
+            EPLog.e("setNotify");
             BleWork.this.failedProcessing();
         }
     }
 
     private void characteristicRead() {
-        EpLog.m77i("read " + mSequence);
+        EPLog.i("read " + mSequence);
         if (mSequence != jobSequence.MIB_REBOOT_NW) {
             final int[] iArr = {0};
             handlerRead.postDelayed(new Runnable() {
@@ -1038,29 +1038,29 @@ public class BleWork {
                                     int i = iArr[0] + 1;
                                     iArr[0] = i;
                                     if (i < 3) {
-                                        EpLog.e("FALSE !! retry " + iArr[0]);
+                                        EPLog.e("FALSE !! retry " + iArr[0]);
                                         BleWork.this.handlerRead.removeCallbacks((Runnable) null);
                                         BleWork.this.handlerRead.postDelayed(this, (long) (iArr[0] * 500));
                                         return;
                                     }
-                                    EpLog.e("FALSE !!!");
+                                    EPLog.e("FALSE !!!");
                                     BleWork.this.sequenceError();
                                     return;
                                 }
                                 return;
                             } catch (NullPointerException unused) {
-                                EpLog.e("mConnGatt NULL !");
+                                EPLog.e("mConnGatt NULL !");
                                 return;
                             }
                         case 9:
                             if (!BleWork.mConnGatt.readCharacteristic(BLEUuid.GattCharsMap.get(BLEUuid.CHAR_PASSWORD_STRING))) {
-                                EpLog.e("FALSE !! ");
+                                EPLog.e("FALSE !! ");
                                 return;
                             }
                             return;
                         case 10:
                             if (!BleWork.mConnGatt.readCharacteristic(BLEUuid.GattCharsMap.get(BLEUuid.CHAR_VERSION_STRING))) {
-                                EpLog.e("FALSE !! ");
+                                EPLog.e("FALSE !! ");
                                 return;
                             }
                             return;
@@ -1088,7 +1088,7 @@ public class BleWork {
         if (mDevice == null) {
             mDevice = mSelectItem.getDevice();
             if (mDevice == null) {
-                EpLog.e("mDevice is null !!!");
+                EPLog.e("mDevice is null !!!");
                 return false;
             }
         }
@@ -1098,17 +1098,17 @@ public class BleWork {
         } else {
             i = Constants.EDAM_APPLICATIONDATA_ENTRY_LEN_MAX;
         }
-        EpLog.d("password = " + i);
+        EPLog.d("password = " + i);
         mDevicePassword = String.valueOf(i);
         if (mConnGatt == null && mStatus == 0) {
-            EpLog.m77i("connectGatt");
+            EPLog.i("connectGatt");
             mConnGatt = mDevice.connectGatt(mContext, false, mGattcallback);
             mStatus = 1;
             if (!mReconnect) {
                 mSequence = jobSequence.UNINITIALIZED;
             }
         } else if (mConnGatt != null) {
-            EpLog.m77i("re-connect and re-discover Services");
+            EPLog.i("re-connect and re-discover Services");
             mConnGatt.close();
             mConnGatt = mDevice.connectGatt(mContext, false, mGattcallback);
             mConnGatt.connect();
@@ -1117,7 +1117,7 @@ public class BleWork {
                 mSequence = jobSequence.INITIALIZE;
             }
         } else {
-            EpLog.m77i("  STATE_CONNECTING");
+            EPLog.i("  STATE_CONNECTING");
             mConnGatt = mDevice.connectGatt(mContext, false, mGattcallback);
             mStatus = 1;
             if (!mReconnect) {
@@ -1135,18 +1135,18 @@ public class BleWork {
         setSecurityType(0);
         mReconnect = true;
         mSSID = getSSID(mContext);
-        EpLog.m77i(mSSID);
-        EpLog.e("init");
+        EPLog.i(mSSID);
+        EPLog.e("init");
         return init();
     }
 
     public void checkPassword() {
-        EpLog.i();
+        EPLog.i();
         String str = mDevicePassword;
         if (!str.isEmpty()) {
             BluetoothGattCharacteristic bluetoothGattCharacteristic = BLEUuid.GattCharsMap.get(BLEUuid.CHAR_PASSWORD_STRING);
             bluetoothGattCharacteristic.setValue(Short.parseShort(str), 18, 0);
-            EpLog.m77i("Password write :" + str);
+            EPLog.i("Password write :" + str);
             gattWriteCharacter(bluetoothGattCharacteristic);
         }
     }
@@ -1157,10 +1157,10 @@ public class BleWork {
         handlerWrite.postDelayed(new Runnable() {
             public void run() {
                 if (BleWork.mConnGatt == null) {
-                    EpLog.e("mConnGatt  NULL !");
+                    EPLog.e("mConnGatt  NULL !");
                 }
                 if (bluetoothGattCharacteristic == null) {
-                    EpLog.e("characteristic  NULL !");
+                    EPLog.e("characteristic  NULL !");
                 }
                 try {
                     if (!((BluetoothGatt) Objects.requireNonNull(BleWork.mConnGatt)).writeCharacteristic(bluetoothGattCharacteristic)) {
@@ -1168,16 +1168,16 @@ public class BleWork {
                         int i = iArr[0] + 1;
                         iArr[0] = i;
                         if (i <= 3) {
-                            EpLog.e("writeCharacteristic error ! retry " + iArr[0]);
+                            EPLog.e("writeCharacteristic error ! retry " + iArr[0]);
                             BleWork.this.handlerWrite.removeCallbacks((Runnable) null);
                             BleWork.this.handlerWrite.postDelayed(this, (long) (iArr[0] * 500));
                             return;
                         }
-                        EpLog.e("writeCharacteristic error !! retry failed !!");
+                        EPLog.e("writeCharacteristic error !! retry failed !!");
                         BleWork.this.failedProcessing();
                     }
                 } catch (NullPointerException unused) {
-                    EpLog.e("mConnGatt NULL !");
+                    EPLog.e("mConnGatt NULL !");
                 }
             }
         }, 0);
@@ -1196,7 +1196,7 @@ public class BleWork {
         mIndex = b;
         int mibGetESSIDList = escprLib.mibGetESSIDList(mIBCommand, b);
         if (mibGetESSIDList != 0) {
-            EpLog.e("mibGetESSIDList ret = " + mibGetESSIDList);
+            EPLog.e("mibGetESSIDList ret = " + mibGetESSIDList);
             return;
         }
         byte[] bArr = new byte[mMibCommand.commandBlock.bufSize];
@@ -1215,21 +1215,21 @@ public class BleWork {
         byte[] bytes = mSSID.getBytes(Charset.forName("UTF8"));
         BluetoothGattCharacteristic bluetoothGattCharacteristic = BLEUuid.GattCharsMap.get(BLEUuid.CHAR_SSID_STRING);
         bluetoothGattCharacteristic.setValue(bytes);
-        EpLog.m77i("SSID write :" + mSSID);
+        EPLog.i("SSID write :" + mSSID);
         gattWriteCharacter(bluetoothGattCharacteristic);
     }
 
     public void setSSIDType() {
         mSequence = jobSequence.CHECK_SSID;
         if (mConnGatt == null) {
-            EpLog.e("mConnGatt  NULL !");
+            EPLog.e("mConnGatt  NULL !");
         }
         checkSSID();
     }
 
     private void startSetSSID() {
         int i;
-        EpLog.m77i("mSequence = " + mSequence + " mSSID =  " + mSSID);
+        EPLog.i("mSequence = " + mSequence + " mSSID =  " + mSSID);
         mInSequence = false;
         String str = "";
         String str2 = "";
@@ -1242,19 +1242,19 @@ public class BleWork {
             case MIB_SET_SSID:
                 str = "epsWlanConfSSID";
                 str2 = "mibSetSSID";
-                EpLog.m77i("mSSID  " + mSSID);
+                EPLog.i("mSSID  " + mSSID);
                 if (!mSSID.isEmpty()) {
                     i = mEscprlib.mibSetSSID(mMibCommand, mSSID);
                     break;
                 } else {
-                    EpLog.m82w("set SSID :  empty");
+                    EPLog.m82w("set SSID :  empty");
                     return;
                 }
             case MIB_SEC_LOGIN:
                 str = "epsAdminMibAccessLoginOperation";
                 str2 = "mibSecLogin ";
                 if (mEngineID == null) {
-                    EpLog.e("mEngineID");
+                    EPLog.e("mEngineID");
                     failedProcessing();
                 }
                 i = mEscprlib.mibSecLogin(mMibCommand, mEngineID);
@@ -1263,12 +1263,12 @@ public class BleWork {
                 str = "epsWlanCommonPassPhrase";
                 str2 = "mibSecSetPass ";
                 String str3 = mSSIDPassword;
-                EpLog.m77i("mSSIDPassword  " + mSSIDPassword);
+                EPLog.i("mSSIDPassword  " + mSSIDPassword);
                 if (str3.isEmpty()) {
-                    EpLog.m82w("SSIDPassword is empty");
+                    EPLog.m82w("SSIDPassword is empty");
                 }
                 if (mEngineID == null) {
-                    EpLog.e("mEngineID");
+                    EPLog.e("mEngineID");
                     failedProcessing();
                 }
                 i = mEscprlib.mibSecSetPassword(mMibCommand, mEngineID, str3);
@@ -1277,7 +1277,7 @@ public class BleWork {
                 str = "epsAdminMibAccessLogOutOperation";
                 str2 = "mibSecLogout ";
                 if (mEngineID == null) {
-                    EpLog.e("mEngineID");
+                    EPLog.e("mEngineID");
                     failedProcessing();
                 }
                 i = mEscprlib.mibSecLogout(mMibCommand, mEngineID);
@@ -1289,7 +1289,7 @@ public class BleWork {
                     mSSIDPassword = "";
                 }
                 int i2 = mSSIDPassword.isEmpty() ? 0 : 255;
-                EpLog.m77i("MIB_SET_SECURITY_TYPE SecurityType = " + i2);
+                EPLog.i("MIB_SET_SECURITY_TYPE SecurityType = " + i2);
                 int mibSetSecurityType = mEscprlib.mibSetSecurityType(mMibCommand, i2);
                 if (i2 == 0) {
                     mSequence = jobSequence.MIB_SEC_SKIP;
@@ -1306,13 +1306,13 @@ public class BleWork {
                 break;
         }
         if (i != 0) {
-            EpLog.e(str2 + " ret = " + i);
+            EPLog.e(str2 + " ret = " + i);
             sequenceError();
             return;
         }
         byte[] bArr = new byte[mMibCommand.commandBlock.bufSize];
         System.arraycopy(mMibCommand.commandBlock.buf, 0, bArr, 0, mMibCommand.commandBlock.bufSize);
-        EpLog.m77i("SNMP Request write :" + str + " mSequence   " + mSequence);
+        EPLog.i("SNMP Request write :" + str + " mSequence   " + mSequence);
         BluetoothGattCharacteristic bluetoothGattCharacteristic = BLEUuid.GattCharsMap.get(BLEUuid.CHAR_SNMP_REQUEST_STRING);
         bluetoothGattCharacteristic.setValue(bArr);
         gattWriteCharacter(bluetoothGattCharacteristic);
@@ -1325,7 +1325,7 @@ public class BleWork {
     private void failedProcessing() {
         disconnect();
         if (mSequenceCallbackFailed != null) {
-            EpLog.e(" " + mSequence);
+            EPLog.e(" " + mSequence);
             mSequenceCallbackFailed.call(mSequence);
         }
     }

+ 47 - 47
app/src/main/java/com/epson/mobilephone/common/ble/BleWorkActivity.java

@@ -79,7 +79,7 @@ public class BleWorkActivity extends ActivityIACommon {
     }
 
     protected void onCreate(Bundle bundle) {
-        EpLog.i();
+        EPLog.i();
         super.onCreate(bundle);
         requestWindowFeature(5);
         setContentView(R.layout.activity_scan);
@@ -97,7 +97,7 @@ public class BleWorkActivity extends ActivityIACommon {
         ArrayList parcelableArrayListExtra;
         super.onResume();
         mProbePrinter.bindEpsonService();
-        EpLog.m77i("mSequence = " + BleWork.getInstace().mSequence);
+        EPLog.i("mSequence = " + BleWork.getInstace().mSequence);
         if (mDeviceAdapter == null && BleWork.getInstace().mSequence == BleWork.jobSequence.UNINITIALIZED && (parcelableArrayListExtra = getIntent().getParcelableArrayListExtra(ScannedDevice.TYPE)) != null && parcelableArrayListExtra.size() > 0) {
             init(parcelableArrayListExtra);
         }
@@ -105,7 +105,7 @@ public class BleWorkActivity extends ActivityIACommon {
 
     protected void onPause() {
         super.onPause();
-        EpLog.i();
+        EPLog.i();
     }
 
     protected void onStart() {
@@ -115,7 +115,7 @@ public class BleWorkActivity extends ActivityIACommon {
 
     protected void onStop() {
         super.onStop();
-        EpLog.i();
+        EPLog.i();
         isAlive = false;
         getWindow().clearFlags(128);
     }
@@ -129,22 +129,22 @@ public class BleWorkActivity extends ActivityIACommon {
         mCompletion = new CallbackWork() {
             public void call(Object obj) {
                 if (!(obj instanceof Boolean)) {
-                    EpLog.e(" type mismatch !");
+                    EPLog.e(" type mismatch !");
                 }
                 StringBuilder sb = new StringBuilder();
                 sb.append("result = ");
                 Boolean bool = (Boolean) obj;
                 sb.append(bool.booleanValue());
-                EpLog.m77i(sb.toString());
+                EPLog.i(sb.toString());
                 if (bool.booleanValue()) {
                     BleWorkActivity.this.count = BleWorkActivity.TOTAL_PROGRESS_SEC;
-                    EpLog.m77i("count = " + BleWorkActivity.this.count);
+                    EPLog.i("count = " + BleWorkActivity.this.count);
                 }
                 BleWorkActivity.this.stopCallbacks();
                 if (BleWorkActivity.mAlertDialog != null && BleWorkActivity.mAlertDialog.isShowing()) {
                     BleWorkActivity.this.runOnUiThread(new Runnable() {
                         public void run() {
-                            EpLog.m77i("dismiss ");
+                            EPLog.i("dismiss ");
                             BleWorkActivity.mAlertDialog.dismiss();
                             BleWorkActivity.mAlertDialog = null;
                         }
@@ -160,7 +160,7 @@ public class BleWorkActivity extends ActivityIACommon {
                 Handler unused = BleWorkActivity.mWifiSearchHandler = new Handler();
                 BleWorkActivity.this.runOnUiThread(new Runnable() {
                     public void run() {
-                        EpLog.m77i("setSSID");
+                        EPLog.i("setSSID");
                         BleWorkActivity.mBleWork.setSSID(new BLEUtility.BleWorkCallback() {
                             public void call(Object obj) {
                                 Runnable unused = BleWorkActivity.this.runnableWifiSearch = new Runnable() {
@@ -169,7 +169,7 @@ public class BleWorkActivity extends ActivityIACommon {
                                     public void run() {
                                         int i = postCount;
                                         if (i >= 2) {
-                                            EpLog.m77i("postCount >= 2 ");
+                                            EPLog.i("postCount >= 2 ");
                                             BleWorkActivity.mProbePrinter.interruptSearch();
                                             if (BleWorkActivity.mAlertDialog != null) {
                                                 BleWorkActivity.mAlertDialog.dismiss();
@@ -187,7 +187,7 @@ public class BleWorkActivity extends ActivityIACommon {
                                             try {
                                                 BleWorkActivity.mProbePrinter.search();
                                             } catch (IllegalStateException e) {
-                                                EpLog.e(e.getMessage());
+                                                EPLog.e(e.getMessage());
                                                 BleWorkActivity.mProbePrinter.interruptSearch();
                                                 if (BleWorkActivity.mAlertDialog != null) {
                                                     BleWorkActivity.mAlertDialog.dismiss();
@@ -205,7 +205,7 @@ public class BleWorkActivity extends ActivityIACommon {
                                             sb.append(this.postCount);
                                             sb.append(" delay ");
                                             sb.append(this.postCount == 1 ? 10000 : BleWorkActivity.SECOND_DELAY);
-                                            EpLog.m77i(sb.toString());
+                                            EPLog.i(sb.toString());
                                             BleWorkActivity.mWifiSearchHandler.postDelayed(this, postCount == 1 ? 10000 : 200000);
                                         }
                                     }
@@ -214,7 +214,7 @@ public class BleWorkActivity extends ActivityIACommon {
                             }
                         }, new BLEUtility.BleWorkCallback() {
                             public void call(Object obj) {
-                                EpLog.e("BleWorkCallback");
+                                EPLog.e("BleWorkCallback");
                                 if (BleWorkActivity.mCompletion != null) {
                                     BleWorkActivity.mCompletion.call(false);
                                 }
@@ -227,14 +227,14 @@ public class BleWorkActivity extends ActivityIACommon {
         mSequenceCallbackSuccess = new BLEUtility.BleWorkCallback() {
             public void call(Object obj) {
                 BleWork.jobSequence jobsequence = (BleWork.jobSequence) obj;
-                EpLog.m77i("mSequenceCallbackSuccess  " + jobsequence);
+                EPLog.i("mSequenceCallbackSuccess  " + jobsequence);
                 if (jobsequence == BleWork.jobSequence.UNINITIALIZED || jobsequence == BleWork.jobSequence.BEFORE_CHECK_SSID || jobsequence == BleWork.jobSequence.MIB_GET_MACADDRESS || jobsequence == BleWork.jobSequence.AFTER_SETTING_PASSWORD) {
                     BleWorkActivity.this.stopConnectTimeOut();
                 }
                 if (!(jobsequence == BleWork.jobSequence.UNINITIALIZED || jobsequence == BleWork.jobSequence.BEFORE_CHECK_SSID || !BleWorkActivity.mBleWork.getSSIDPassword().isEmpty() || BleWorkActivity.mAlertDialog == null || ((jobsequence == BleWork.jobSequence.CHECK_SSID && BleWorkActivity.mBleWork.getSecurityType() == 1) || BleWorkActivity.mBleWork.getSecurityType() == 255))) {
                     BleWorkActivity.mAlertDialog.dismiss();
                     BleWorkActivity.mAlertDialog = null;
-                    EpLog.m77i("mAlertDialog        dismiss " + jobsequence);
+                    EPLog.i("mAlertDialog        dismiss " + jobsequence);
                 }
                 if (jobsequence == BleWork.jobSequence.CHECK_SSID) {
                     BleWorkActivity.this.setSSIDPassword();
@@ -327,7 +327,7 @@ public class BleWorkActivity extends ActivityIACommon {
 
     private void waitingCommunicationDaialog() {
         if (mAlertDialog != null) {
-            EpLog.m77i("dismiss ");
+            EPLog.i("dismiss ");
             mAlertDialog.dismiss();
             mAlertDialog = null;
         }
@@ -352,10 +352,10 @@ public class BleWorkActivity extends ActivityIACommon {
             public void run() {
                 int i;
                 if (BleWorkActivity.this.isStopSetUpProgress) {
-                    EpLog.m77i("☆☆runnableSetUpProgress retuen ");
+                    EPLog.i("☆☆runnableSetUpProgress retuen ");
                     return;
                 }
-                EpLog.m77i("mSequence " + BleWorkActivity.mBleWork.mSequence);
+                EPLog.i("mSequence " + BleWorkActivity.mBleWork.mSequence);
                 BleWorkActivity bleWorkActivity = BleWorkActivity.this;
                 bleWorkActivity.count = bleWorkActivity.count + 1;
                 int i2 = BleWorkActivity.this.count;
@@ -365,7 +365,7 @@ public class BleWorkActivity extends ActivityIACommon {
                         BleWorkActivity.mAlertDialog.dismiss();
                         BleWorkActivity.mAlertDialog = null;
                     }
-                    EpLog.e("TIME OUT");
+                    EPLog.e("TIME OUT");
                     BleWorkActivity.mCompletion.call(false);
                     CallbackWork unused = BleWorkActivity.mCompletion = null;
                     return;
@@ -378,7 +378,7 @@ public class BleWorkActivity extends ActivityIACommon {
                     }
                     i = ((((i3 - 90)) / 12.0d) + 90.0d);
                 }
-                EpLog.m77i(BleWorkActivity.this.count + "::" + i + " %");
+                EPLog.i(BleWorkActivity.this.count + "::" + i + " %");
                 BleWorkActivity.this.updateProgress(i);
                 if (!BleWorkActivity.this.isStopSetUpProgress) {
                     BleWorkActivity.this.setUpProgressHandler.postDelayed(this, 1000);
@@ -431,7 +431,7 @@ public class BleWorkActivity extends ActivityIACommon {
         BleScanWork.getInstace().stopScan();
         mBleWork.resetSequence();
         mBleWork.setSequenceCallback(mSequenceCallbackSuccess, mSequenceCallbackFailed);
-        EpLog.d("              getInfoForConnectDialog");
+        EPLog.d("              getInfoForConnectDialog");
         getInfoForConnectDialog(displayName);
         mBleWork.init(this, scannedDevice);
     }
@@ -452,7 +452,7 @@ public class BleWorkActivity extends ActivityIACommon {
         mTimeoutHandler = new Handler();
         mTimeoutHandler.postDelayed(new Runnable() {
             public void run() {
-                EpLog.e(" timeout ------------" + BleWorkActivity.mBleWork.mSequence);
+                EPLog.e(" timeout ------------" + BleWorkActivity.mBleWork.mSequence);
                 if (BleWorkActivity.mBleWork.mSequence == BleWork.jobSequence.AFTER_SETTING_PASSWORD || BleWorkActivity.mBleWork.mSequence == BleWork.jobSequence.MIB_GET_MACADDRESS || BleWorkActivity.mBleWork.mSequence == BleWork.jobSequence.BEFORE_CHECK_SSID || BleWorkActivity.mBleWork.mSequence == BleWork.jobSequence.UNINITIALIZED) {
                     BleWorkActivity.mBleWork.failedProcessing();
                 }
@@ -474,7 +474,7 @@ public class BleWorkActivity extends ActivityIACommon {
             public void run() {
                 BleWorkActivity.this.stopCallbacks();
                 BleWork.jobSequence jobsequence = jobsequence;
-                EpLog.m77i("sequence = " + jobsequence);
+                EPLog.i("sequence = " + jobsequence);
                 if (BleWorkActivity.mAlertDialog != null) {
                     BleWorkActivity.mAlertDialog.dismiss();
                 }
@@ -512,7 +512,7 @@ public class BleWorkActivity extends ActivityIACommon {
 
     public static /* synthetic */ void lambda$SSIDfailedDialog$1(BleWorkActivity bleWorkActivity, BleWork.jobSequence jobsequence) {
         bleWorkActivity.stopCallbacks();
-        EpLog.m77i("sequence = " + jobsequence);
+        EPLog.i("sequence = " + jobsequence);
         AlertDialog alertDialog = bleWorkActivity.mAlertDialog;
         if (alertDialog != null) {
             alertDialog.dismiss();
@@ -555,7 +555,7 @@ public class BleWorkActivity extends ActivityIACommon {
             public void run() {
                 BleWorkActivity.mBleWork.mSequence = BleWork.jobSequence.MIB_SET_SSID;
                 BleWorkActivity.mBleWork.disconnect(false);
-                EpLog.d("sequence = " + BleWorkActivity.mBleWork.mSequence);
+                EPLog.d("sequence = " + BleWorkActivity.mBleWork.mSequence);
                 List<String> ssidLis = BleWorkActivity.mBleWork.getSsidLis();
                 ssidLis.remove(BleWorkActivity.this.getResources().getText(R.string.BLE_select_SSID_manual_button).toString());
                 BleWorkActivity.this.sortSSIDlist(ssidLis);
@@ -574,28 +574,28 @@ public class BleWorkActivity extends ActivityIACommon {
                 cancelable.setItems(strArr, new DialogInterface.OnClickListener() {
                     public void onClick(DialogInterface dialogInterface, int i) {
                         String str = strArr[i];
-                        EpLog.d("select = " + str);
+                        EPLog.d("select = " + str);
                         if (i == strArr.length - 1) {
                             BleWorkActivity.this.setSSID();
                             return;
                         }
-                        EpLog.m77i("☆" + BleWorkActivity.mBleWork.mSequence + "::" + BleWorkActivity.mBleWork.mStatus);
+                        EPLog.i("☆" + BleWorkActivity.mBleWork.mSequence + "::" + BleWorkActivity.mBleWork.mStatus);
                         BleWorkActivity.mBleWork.setSSID(str);
                         if (BleWorkActivity.mBleWork.mSequence == BleWork.jobSequence.DISCONNECTED || BleWorkActivity.mBleWork.mStatus == 0) {
-                            EpLog.m77i("☆☆ " + BleWorkActivity.mBleWork.mSequence + "::" + BleWorkActivity.mBleWork.mStatus);
+                            EPLog.i("☆☆ " + BleWorkActivity.mBleWork.mSequence + "::" + BleWorkActivity.mBleWork.mStatus);
                             BleWorkActivity.mBleWork.mSequence = BleWork.jobSequence.BEFORE_CHECK_SSID;
                             BleWorkActivity.mBleWork.connect();
-                            EpLog.d("              getInfoForConnectDialog");
+                            EPLog.d("              getInfoForConnectDialog");
                             BleWorkActivity.this.getInfoForConnectDialog(BleWorkActivity.mBleWork.getDeviceName());
                             return;
                         }
-                        EpLog.m77i("☆☆☆☆ " + BleWorkActivity.mBleWork.mSequence + "::" + BleWorkActivity.mBleWork.mStatus);
+                        EPLog.i("☆☆☆☆ " + BleWorkActivity.mBleWork.mSequence + "::" + BleWorkActivity.mBleWork.mStatus);
                         BleWorkActivity.mBleWork.setSSIDType();
                     }
                 });
                 cancelable.setNegativeButton(BleWorkActivity.this.getString(R.string.BLE_setup_abort_button), new DialogInterface.OnClickListener() {
                     public void onClick(DialogInterface dialogInterface, int i) {
-                        EpLog.i();
+                        EPLog.i();
                         BleWorkActivity.mBleWork.disconnect(true);
                     }
                 });
@@ -628,7 +628,7 @@ public class BleWorkActivity extends ActivityIACommon {
     private void setSSID() {
         runOnUiThread(new Runnable() {
             public void run() {
-                EpLog.m77i("inputs = ");
+                EPLog.i("inputs = ");
                 final EditText editText = new EditText(BleWorkActivity.this);
                 editText.setInputType(33);
                 editText.setFilters(BleWorkActivity.this.getInputFilters(100));
@@ -640,7 +640,7 @@ public class BleWorkActivity extends ActivityIACommon {
                     }
 
                     public void afterTextChanged(Editable editable) {
-                        EpLog.m77i("afterTextChanged " + editable);
+                        EPLog.i("afterTextChanged " + editable);
                         BleWorkActivity.this.validateInputText(100, editable.toString());
                     }
                 });
@@ -650,7 +650,7 @@ public class BleWorkActivity extends ActivityIACommon {
                 cancelable.setView(editText);
                 cancelable.setPositiveButton(BleWorkActivity.this.getString(R.string.ok_button), new DialogInterface.OnClickListener() {
                     public void onClick(DialogInterface dialogInterface, int i) {
-                        EpLog.m77i(editText.getText().toString());
+                        EPLog.i(editText.getText().toString());
                         BleWorkActivity.mBleWork.setSSID(editText.getText().toString());
                         BleWorkActivity.mBleWork.setSecurityType(255);
                         BleWorkActivity.mBleWork.mSequence = BleWork.jobSequence.SET_PASSWORD;
@@ -659,7 +659,7 @@ public class BleWorkActivity extends ActivityIACommon {
                 });
                 cancelable.setNegativeButton(BleWorkActivity.this.getString(R.string.no_button), new DialogInterface.OnClickListener() {
                     public void onClick(DialogInterface dialogInterface, int i) {
-                        EpLog.i();
+                        EPLog.i();
                         ((InputMethodManager) BleWorkActivity.this.getSystemService("input_method")).hideSoftInputFromWindow(editText.getWindowToken(), 2);
                         if (!BleWorkActivity.mBleWork.getSsidLis().isEmpty()) {
                             BleWorkActivity.mBleWork.mSequence = BleWork.jobSequence.MIB_GET_SSID_LIST;
@@ -680,18 +680,18 @@ public class BleWorkActivity extends ActivityIACommon {
     }
 
     private void setSSIDPassword() {
-        EpLog.i();
+        EPLog.i();
         if (!mBleWork.getSSIDPassword().isEmpty() || mBleWork.getSecurityType() == 1 || (mBleWork.getSecurityType() == 255 && mBleWork.mSequence != BleWork.jobSequence.SET_PASSWORD)) {
             runOnUiThread(new Runnable() {
                 public void run() {
-                    EpLog.m77i("password mNext");
+                    EPLog.i("password mNext");
                     BleWorkActivity.mNext.call("");
                     if (BleWorkActivity.this.setUpProgressHandler == null && BleWorkActivity.this.runnableSetUpProgress == null) {
                         if (BleWorkActivity.mAlertDialog != null) {
                             BleWorkActivity.mAlertDialog.dismiss();
                             BleWorkActivity.mAlertDialog = null;
                         }
-                        EpLog.d("waitingCommunicationDaialog");
+                        EPLog.d("waitingCommunicationDaialog");
                         BleWorkActivity.this.waitingCommunicationDaialog();
                     }
                 }
@@ -699,7 +699,7 @@ public class BleWorkActivity extends ActivityIACommon {
         } else {
             runOnUiThread(new Runnable() {
                 public void run() {
-                    EpLog.m77i("inputs = ");
+                    EPLog.i("inputs = ");
                     final short securityType = BleWorkActivity.mBleWork.getSecurityType();
                     if (securityType == 7 || securityType == 10) {
                         BleWorkActivity bleWorkActivity = BleWorkActivity.this;
@@ -717,7 +717,7 @@ public class BleWorkActivity extends ActivityIACommon {
                         }
 
                         public void afterTextChanged(Editable editable) {
-                            EpLog.m77i("afterTextChanged " + editable);
+                            EPLog.i("afterTextChanged " + editable);
                             BleWorkActivity.this.validateInputText(securityType, editable.toString());
                         }
                     });
@@ -729,19 +729,19 @@ public class BleWorkActivity extends ActivityIACommon {
                     cancelable.setView(editText);
                     cancelable.setPositiveButton(BleWorkActivity.this.getString(R.string.ok_button), new DialogInterface.OnClickListener() {
                         public void onClick(DialogInterface dialogInterface, int i) {
-                            EpLog.m77i(editText.getText().toString());
+                            EPLog.i(editText.getText().toString());
                             BleWorkActivity.mBleWork.setSSIDPassword(editText.getText().toString());
                             BleWorkActivity.mBleWork.mSequence = BleWork.jobSequence.MIB_GET_MACADDRESS;
                             BleWorkActivity.mBleWork.connect();
                             BleWorkActivity.this.setConnectTimeOut();
-                            EpLog.d("waitingCommunicationDaialog");
+                            EPLog.d("waitingCommunicationDaialog");
                             BleWorkActivity.this.waitingCommunicationDaialog();
                             ((InputMethodManager) BleWorkActivity.this.getSystemService("input_method")).hideSoftInputFromWindow(editText.getWindowToken(), 2);
                         }
                     });
                     cancelable.setNegativeButton(BleWorkActivity.this.getString(R.string.no_button), new DialogInterface.OnClickListener() {
                         public void onClick(DialogInterface dialogInterface, int i) {
-                            EpLog.i();
+                            EPLog.i();
                             ((InputMethodManager) BleWorkActivity.this.getSystemService("input_method")).hideSoftInputFromWindow(editText.getWindowToken(), 2);
                             if (!BleWorkActivity.mBleWork.getSsidLis().isEmpty()) {
                                 BleWorkActivity.mBleWork.mSequence = BleWork.jobSequence.MIB_GET_SSID_LIST;
@@ -761,10 +761,10 @@ public class BleWorkActivity extends ActivityIACommon {
                         }
                         button.setEnabled(z);
                     }
-                    EpLog.d("sequence = " + BleWorkActivity.mBleWork.mSequence);
+                    EPLog.d("sequence = " + BleWorkActivity.mBleWork.mSequence);
                     BleWorkActivity.mBleWork.mSequence = BleWork.jobSequence.AFTER_SETTING_PASSWORD;
                     BleWorkActivity.mBleWork.disconnect(false);
-                    EpLog.d("sequence = " + BleWorkActivity.mBleWork.mSequence);
+                    EPLog.d("sequence = " + BleWorkActivity.mBleWork.mSequence);
                 }
             });
         }
@@ -820,12 +820,12 @@ public class BleWorkActivity extends ActivityIACommon {
             try {
                 charSequence = charSequence2.replace(new String(new byte[]{-62, -91}, CharEncoding.UTF_8), new String("\\".getBytes(), CharEncoding.UTF_8));
             } catch (UnsupportedEncodingException e) {
-                EpLog.e(e.getMessage());
+                EPLog.e(e.getMessage());
             }
             if (charSequence.toString().matches("^[a-zA-Z0-9!-/:-@\\[-\\`\\{-\\~]+$")) {
                 return charSequence;
             }
-            EpLog.m77i("in NG");
+            EPLog.i("in NG");
             return "";
         }
     }

+ 3 - 3
app/src/main/java/com/epson/mobilephone/common/ble/DeviceAdapter.java

@@ -56,13 +56,13 @@ public class DeviceAdapter extends ArrayAdapter<ScannedDevice> {
         Resources resources = getContext().getResources();
         int i2 = R.drawable.signal_1;
         if (i >= -60) {
-            EpLog.m77i("HIGH_SIGNAL");
+            EPLog.i("HIGH_SIGNAL");
             i2 = R.drawable.signal_3;
         } else if (i >= -70) {
-            EpLog.m77i("MID_SIGNAL");
+            EPLog.i("MID_SIGNAL");
             i2 = R.drawable.signal_2;
         } else if (i >= -75) {
-            EpLog.m77i("LOW_SIGNAL");
+            EPLog.i("LOW_SIGNAL");
         }
         return resources.getDrawable(i2);
     }

+ 35 - 35
app/src/main/java/com/epson/mobilephone/common/ble/ProbePrinter.java

@@ -41,24 +41,24 @@ public class ProbePrinter {
     private volatile boolean isPrinterFound;
     private IEpsonServiceCallback mCallback = new IEpsonServiceCallback.Stub() {
         public void onGetStatusState() throws RemoteException {
-            EpLog.i();
+            EPLog.i();
         }
 
         public void onGetInkState() throws RemoteException {
-            EpLog.i();
+            EPLog.i();
         }
 
         public void onFindPrinterResult(String str, String str2, String str3, String str4, String str5) throws RemoteException {
-            EpLog.m77i("find      :" + str + ":" + str2 + ":★" + str3 + "★:" + str4);
+            EPLog.i("find      :" + str + ":" + str2 + ":★" + str3 + "★:" + str4);
             if (str.contains("FINISH")) {
-                EpLog.m77i(" !!  FINISH  !!");
+                EPLog.i(" !!  FINISH  !!");
                 if (!ProbePrinter.this.isPrinterFound) {
                     ProbePrinter.this.unbindEpsonService();
-                    EpLog.m77i(" !!  確認失敗  !!");
+                    EPLog.i(" !!  確認失敗  !!");
                     ProbePrinter.this.callbackCompletion(false);
                 }
             } else if (str3.contains(ProbePrinter.macAddress)) {
-                EpLog.m77i(" !!  FIND    OK    !! :" + ProbePrinter.macAddress + ": ◆");
+                EPLog.i(" !!  FIND    OK    !! :" + ProbePrinter.macAddress + ": ◆");
                 boolean unused = ProbePrinter.this.isPrinterFound = true;
                 MyPrinter myPrinter = new MyPrinter(str, str2, str3, str4);
                 Message obtainMessage = ProbePrinter.mHandler.obtainMessage();
@@ -70,24 +70,24 @@ public class ProbePrinter {
         }
 
         public void onNotifyProgress(int i, int i2) throws RemoteException {
-            EpLog.i();
+            EPLog.i();
         }
 
         public void onNotifyContinueable(int i) throws RemoteException {
-            EpLog.i();
+            EPLog.i();
         }
 
         public void onNotifyError(int i, int i2, boolean z) throws RemoteException {
-            EpLog.i();
+            EPLog.i();
         }
 
         public void onNotifyEndJob(int i) throws RemoteException {
-            EpLog.i();
+            EPLog.i();
         }
     };
     private ServiceConnection mEpsonConnection = new ServiceConnection() {
         public void onServiceConnected(ComponentName componentName, IBinder iBinder) {
-            EpLog.i();
+            EPLog.i();
             IEpsonService unused = ProbePrinter.mEpsonService = IEpsonService.Stub.asInterface(iBinder);
             if (ProbePrinter.mEpsonService != null) {
                 try {
@@ -99,7 +99,7 @@ public class ProbePrinter {
         }
 
         public void onServiceDisconnected(ComponentName componentName) {
-            EpLog.m77i("ComponentName " + componentName);
+            EPLog.i("ComponentName " + componentName);
             IEpsonService unused = ProbePrinter.mEpsonService = null;
         }
     };
@@ -117,14 +117,14 @@ public class ProbePrinter {
                             ProbePrinter.this.search();
                             break;
                         } catch (IllegalStateException e) {
-                            EpLog.e(e.getMessage());
+                            EPLog.e(e.getMessage());
                             break;
                         }
                     case 2:
                         ProbePrinter.this.interruptSearch();
                         break;
                     default:
-                        EpLog.m77i("not handled (" + message.what + ")");
+                        EPLog.i("not handled (" + message.what + ")");
                         break;
                 }
             } else {
@@ -148,7 +148,7 @@ public class ProbePrinter {
     }
 
     public ProbePrinter setMacAddress(String str) {
-        EpLog.d("★" + str + "★ ");
+        EPLog.d("★" + str + "★ ");
         macAddress = str;
         return this;
     }
@@ -161,7 +161,7 @@ public class ProbePrinter {
     public void search() throws IllegalStateException {
         String str;
         if (mEpsonService == null || completion == null || (str = macAddress) == null || str.length() != 12 || completion == null) {
-            EpLog.e("Required field is not set.");
+            EPLog.e("Required field is not set.");
             throw new IllegalStateException("Required field is not set.");
         }
         Context context2 = context;
@@ -170,7 +170,7 @@ public class ProbePrinter {
             synchronized (lock) {
                 isPrinterFound = false;
             }
-            EpLog.d("mEpsonService.searchPrinters");
+            EPLog.d("mEpsonService.searchPrinters");
             mEpsonService.setTimeOut(180);
             mEpsonService.searchPrinters((String) null, (String) null, 1);
         } catch (RemoteException e) {
@@ -179,11 +179,11 @@ public class ProbePrinter {
     }
 
     public void interruptSearch() {
-        EpLog.m68d();
+        EPLog.m68d();
         mHandler.removeMessages(1);
         if (mEpsonService != null) {
             try {
-                EpLog.m77i("cancelSearchPrinter");
+                EPLog.i("cancelSearchPrinter");
                 mEpsonService.cancelSearchPrinter();
             } catch (RemoteException e) {
                 e.printStackTrace();
@@ -198,30 +198,30 @@ public class ProbePrinter {
             context2.bindService(new Intent(context2, EpsonService.class), mEpsonConnection, 1);
         }
         if (mEpsonService == null) {
-            EpLog.e("mEpsonService NULL");
+            EPLog.e("mEpsonService NULL");
             mHandler.sendEmptyMessageDelayed(17, 1000);
             return;
         }
-        EpLog.m77i("bindEpsonService OK !!");
+        EPLog.i("bindEpsonService OK !!");
     }
 
     private void unbindEpsonService() {
-        EpLog.i();
+        EPLog.i();
         if (mEpsonService != null) {
             if (!this.isPrinterFound) {
                 mHandler.sendEmptyMessageDelayed(2, 200);
-                EpLog.m77i("1");
+                EPLog.i("1");
             }
             try {
-                EpLog.m77i(ExifInterface.GPS_MEASUREMENT_2D);
-                EpLog.m77i("unregisterCallback");
+                EPLog.i(ExifInterface.GPS_MEASUREMENT_2D);
+                EPLog.i("unregisterCallback");
                 mEpsonService.unregisterCallback(mCallback);
                 context.unbindService(mEpsonConnection);
                 mEpsonService = null;
             } catch (RemoteException unused) {
-                EpLog.e("unregisterCallback   mEpsonService");
+                EPLog.e("unregisterCallback   mEpsonService");
             }
-            EpLog.m77i(ExifInterface.GPS_MEASUREMENT_3D);
+            EPLog.i(ExifInterface.GPS_MEASUREMENT_3D);
         }
     }
 
@@ -272,13 +272,13 @@ public class ProbePrinter {
             }
             try {
                 Utils.copyFile(instance.getSupportedMedia(), instance.getSavedSupportedMedia());
-                EpLog.m77i("Success epsWrapperGetSupportedMedia");
+                EPLog.i("Success epsWrapperGetSupportedMedia");
             } catch (IOException e) {
                 e.printStackTrace();
             }
             try {
                 Utils.copyFile(instance.getAreaInfo(), instance.getSavedAreaInfo());
-                EpLog.m77i("Success copy AreaInfo");
+                EPLog.i("Success copy AreaInfo");
             } catch (IOException e2) {
                 e2.printStackTrace();
             }
@@ -306,26 +306,26 @@ public class ProbePrinter {
         protected Context doInBackground(Context... contextArr) {
             boolean z;
             Context applicationContext = contextArr[0].getApplicationContext();
-            EpLog.m77i("スキャナ検索処理");
+            EPLog.i("スキャナ検索処理");
             int escanWrapperInitDriver = ProbePrinter.mScanner.escanWrapperInitDriver(applicationContext);
             if (escanWrapperInitDriver == -1050) {
                 z = true;
             } else if (escanWrapperInitDriver != 0) {
-                EpLog.m77i("Scan 機能不明");
+                EPLog.i("Scan 機能不明");
                 return contextArr[0];
             } else {
                 z = false;
             }
             try {
                 ScanSettingHelper.recodeScannerInfo(ProbePrinter.mScanner, applicationContext, mPrinter);
-                EpLog.m77i("Scan 機能あり");
+                EPLog.i("Scan 機能あり");
                 if (!z) {
                     ProbePrinter.mScanner.escanWrapperReleaseDriver();
                 }
-                EpLog.m77i("YYY");
+                EPLog.i("YYY");
                 return contextArr[0];
             } catch (EscanLibException | IOException unused) {
-                EpLog.m77i("Scan 機能なし");
+                EPLog.i("Scan 機能なし");
                 Context context = contextArr[0];
                 if (!z) {
                     ProbePrinter.mScanner.escanWrapperReleaseDriver();
@@ -341,7 +341,7 @@ public class ProbePrinter {
 
         protected void onPostExecute(Context context) {
             super.onPostExecute(context);
-            EpLog.m77i("スキャナ検索onPostExecute");
+            EPLog.i("スキャナ検索onPostExecute");
             ProbePrinter.this.callbackCompletion(true);
         }
     }

+ 2 - 2
app/src/main/java/com/epson/mobilephone/common/ble/util/BLEUtility.java

@@ -43,7 +43,7 @@ public class BLEUtility {
             if (thread == null || !thread.getName().equals(str) || !thread.isAlive()) {
                 i++;
             } else {
-                EpLog.d("" + thread);
+                EPLog.d("" + thread);
                 return true;
             }
         }
@@ -65,7 +65,7 @@ public class BLEUtility {
             if (thread == null || !thread.getName().equals(str)) {
                 i++;
             } else {
-                EpLog.m77i("find thread : " + str);
+                EPLog.i("find thread : " + str);
                 return thread;
             }
         }

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

@@ -243,8 +243,8 @@ public class EscprLib {
     }
 
     public int init_driver(Context context, String str) {
-        EpLog.m77i("init_driver :" + str);
-        EpLog.m77i(is64bit() ? "Native is operating at 64 bit !!" : "Native is operating at 32 bit");
+        EPLog.i("init_driver :" + str);
+        EPLog.i(is64bit() ? "Native is operating at 64 bit !!" : "Native is operating at 32 bit");
         return init_driver(context, str, iPrintPackageName.equals(context.getPackageName()) ? (byte) 8 : 10);
     }
 
@@ -261,7 +261,7 @@ public class EscprLib {
     }
 
     public void findPrinterCallback(String str) {
-        EpLog.i("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.i("  @@@@@@@@@@   called epsNotifyDataChange : %s", str);
+        EPLog.i("  @@@@@@@@@@   called epsNotifyDataChange : %s", str);
         if (mHandler != null) {
             Message obtain = Message.obtain();
             obtain.what = 0;
@@ -281,7 +281,7 @@ public class EscprLib {
     }
 
     public void epsNotifyContinueable(int i) {
-        EpLog.m77i("called epsNotifyContinueable :" + i);
+        EPLog.i("called epsNotifyContinueable :" + i);
         if (mHandler != null) {
             Message obtain = Message.obtain();
             obtain.what = 1;
@@ -291,7 +291,7 @@ public class EscprLib {
     }
 
     public void epsNotifyError(int i, int i2, boolean z) {
-        EpLog.m77i("called epsNotifyError " + i + ":" + i2 + ":" + z);
+        EPLog.i("called epsNotifyError " + i + ":" + i2 + ":" + z);
         if (mHandler != null) {
             Message obtain = Message.obtain();
             obtain.what = 2;
@@ -303,7 +303,7 @@ public class EscprLib {
     }
 
     public void epsNotifyPage(int i) {
-        EpLog.m77i("called epsNotifyPage :" + i);
+        EPLog.i("called epsNotifyPage :" + i);
         if (mHandler != null) {
             Message obtain = Message.obtain();
             obtain.what = 30;
@@ -325,7 +325,7 @@ public class EscprLib {
     }
 
     public int doFindPrinter(int i, int i2) {
-        EpLog.i("escprLib2", "**********Call do find printer************");
+        EPLog.i("escprLib2", "**********Call do find printer************");
         return epsWrapperFindPrinter(i, i2);
     }
 
@@ -334,7 +334,7 @@ public class EscprLib {
     }
 
     public int epsWrapperProbePrinter2(int i, String str, String str2, int i2) {
-        EpLog.i();
+        EPLog.i();
         if (i2 != 1) {
             if (i2 == 3 && str2 != null && str2.length() > 0) {
                 printerIp = str2;
@@ -362,16 +362,16 @@ public class EscprLib {
     }
 
     private void findPrinterCB() {
-        EpLog.m77i("JAVA findPrinterCB");
+        EPLog.i("JAVA findPrinterCB");
         String str = printerList;
         if (str != null && str.length() > 0) {
             String name = getClass().getName();
-            EpLog.i(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);
+                EPLog.i("JAVA mIsSearch == " + mIsSearch);
                 if (mIsSearch) {
-                    EpLog.m77i("JAVA mHandler == " + mHandler);
+                    EPLog.i("JAVA mHandler == " + mHandler);
                     if (mHandler != null) {
                         Message obtain = Message.obtain();
                         obtain.what = 0;
@@ -390,14 +390,14 @@ public class EscprLib {
                             bundle.putString(BoxUser.FIELD_LANGUAGE, split[7]);
                         }
                         obtain.setData(bundle);
-                        EpLog.m77i("JAVA send message");
+                        EPLog.i("JAVA send message");
                         mHandler.sendMessage(obtain);
                     }
                 }
             } else {
                 bInvalidId = true;
                 String name2 = getClass().getName();
-                EpLog.m72e(name2, "Invalid IP Printer: Expected = " + printerId);
+                EPLog.m72e(name2, "Invalid IP Printer: Expected = " + printerId);
             }
         }
         printerList = "";
@@ -483,7 +483,7 @@ public class EscprLib {
         }
         String macAddress = ((WifiManager) context.getApplicationContext().getSystemService(Service.WIFI_SERVICE)).getConnectionInfo().getMacAddress();
         if (macAddress != null) {
-            EpLog.d("getEngineId macAdress = " + macAddress);
+            EPLog.d("getEngineId macAdress = " + macAddress);
             String[] split = macAddress.split(":", 6);
             if (split.length == 6) {
                 for (int i2 = 0; i2 < 6; i2++) {

+ 8 - 2
app/src/main/java/com/epson/mobilephone/common/license/InfoDisplayActivity.java

@@ -4,6 +4,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
 import android.view.MenuItem;
+import android.view.Window;
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
@@ -11,11 +12,15 @@ import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
 import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
 
 import java.io.Serializable;
 
 import epson.print.R;
 
+/**
+ * 用户协议页面
+ */
 public class InfoDisplayActivity extends AppCompatActivity {
     private static final String KEY_SCROLL_Y = "scroll_y";
     private static final String PARAM_KEY_DOCUMENT_TYPE = "document_type";
@@ -33,9 +38,10 @@ public class InfoDisplayActivity extends AppCompatActivity {
 
     protected void onCreate(Bundle bundle) {
         super.onCreate(bundle);
-        supportRequestWindowFeature(8);
+        supportRequestWindowFeature(Window.FEATURE_ACTION_BAR);
         setContentView(R.layout.activity_info_display);
-        setSupportActionBar((Toolbar) findViewById(R.id.toolbar));
+
+        setSupportActionBar(findViewById(R.id.toolbar));
         TitleAndDocument titleAndDocumentFromIntent = getTitleAndDocumentFromIntent(getIntent());
         if (titleAndDocumentFromIntent == null) {
             finish();

+ 11 - 7
app/src/main/java/com/epson/mobilephone/common/license/LicenseTopActivity.java

@@ -3,10 +3,7 @@ package com.epson.mobilephone.common.license;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-
-
 import android.view.View;
-import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.TextView;
 
@@ -14,11 +11,12 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
 
-import com.epson.mobilephone.common.license.SimpleMessageDialogFragment;
-
 import epson.common.Constants;
 import epson.print.R;
 
+/**
+ * 用户协议
+ */
 public class LicenseTopActivity extends AppCompatActivity implements SimpleMessageDialogFragment.DialogCallback {
     private static final String DIALOG_ID = "dialog";
     private static final int DIALOG_ID_DISAGREE = 2;
@@ -35,12 +33,13 @@ public class LicenseTopActivity extends AppCompatActivity implements SimpleMessa
     protected void onCreate(Bundle bundle) {
         super.onCreate(bundle);
         setContentView(R.layout.activity_license_top);
-        ((ViewGroup) findViewById(R.id.licenseViewGroup)).setOnClickListener(new View.OnClickListener() {
+
+        findViewById(R.id.licenseViewGroup).setOnClickListener(new View.OnClickListener() {
             public void onClick(View view) {
                 startDocumentDisplayActivity(1);
             }
         });
-        ((ViewGroup) findViewById(R.id.privacyStatementViewGroup)).setOnClickListener(new View.OnClickListener() {
+        findViewById(R.id.privacyStatementViewGroup).setOnClickListener(new View.OnClickListener() {
             public void onClick(View view) {
                 startDocumentDisplayActivity(2);
             }
@@ -135,6 +134,11 @@ public class LicenseTopActivity extends AppCompatActivity implements SimpleMessa
         SimpleMessageDialogFragment.newInstance(getString(R.string.Disagree_License_Button_Message), 2).show(getSupportFragmentManager(), DIALOG_ID);
     }
 
+    /**
+     * 跳转到 用户协议/隐私协议 页面
+     *
+     * @param i
+     */
     private void startDocumentDisplayActivity(int i) {
         LicenseInfo licenseInfo = mLicenseInfo;
         if (licenseInfo != null) {

+ 3 - 0
app/src/main/java/com/epson/mobilephone/common/license/RestoreScrollView.java

@@ -4,6 +4,9 @@ import android.content.Context;
 import android.util.AttributeSet;
 import android.widget.ScrollView;
 
+/**
+ * 自定义滚动页面
+ */
 public class RestoreScrollView extends ScrollView {
     private int mLastY;
 

+ 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.i("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.i("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.i("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.i("MaintainPrinter", "doProbePrinter");
+        EPLog.i("MaintainPrinter", "doProbePrinter");
         return mEscprLib.search_printer(str);
     }
 }

+ 10 - 10
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.i("MaintainPrinter2", " @@@@@@@    doInitDriver                 @");
-        EpLog.m77i(mEscpLib.is64bit() ? "Native is operating at ☆ 64 bit !!" : "Native is operating at 32 bit");
+        EPLog.i("MaintainPrinter2", " @@@@@@@    doInitDriver                 @");
+        EPLog.i(mEscpLib.is64bit() ? "Native is operating at ☆ 64 bit !!" : "Native is operating at 32 bit");
         return mEscpLib.epsWrapperInitDriver(context, i);
     }
 
     public int doReleaseDriver() {
-        EpLog.i("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.i("MaintainPrinter2", "**********Call do find printer************");
+            EPLog.i("MaintainPrinter2", "**********Call do find printer************");
             mEscpLib.setSearchStt(true);
             mEscpLib.resetIPAdressCheck();
-            EpLog.i("MaintainPrinter2", "findType = " + i);
+            EPLog.i("MaintainPrinter2", "findType = " + i);
             doFindPrinter = mEscpLib.doFindPrinter(i, i2);
-            EpLog.i("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.i("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.i("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.m72e("MaintainPrinter2", "ret=" + epsWrapperProbePrinter2);
             }
-            EpLog.i("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.i(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.i(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.i("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.i(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.i(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.i(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.i(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.i(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.i(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.i(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.i(TAG, "bulkTransfer length=" + i);
+        EPLog.i(TAG, "bulkTransfer length=" + i);
         int bulkTransfer = usbPrinter.bulkTransfer(this.endPointIn, bArr, i, Constants.EDAM_BUSINESS_NOTEBOOKS_MAX);
-        EpLog.i(TAG, "bulkTransfer readByte=" + bulkTransfer);
+        EPLog.i(TAG, "bulkTransfer readByte=" + bulkTransfer);
         if (bulkTransfer < 0 && (getElapsedTime()) >= 4500.0d) {
             bulkTransfer = 0;
-            EpLog.i(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.i(TAG, "bulkTransfer length=" + i);
+        EPLog.i(TAG, "bulkTransfer length=" + i);
         int bulkTransfer = usbPrinter.bulkTransfer(this.endPointOut, bArr, i, Constants.EDAM_BUSINESS_NOTEBOOKS_MAX);
-        EpLog.i(TAG, "bulkTransfer writtenByte=" + bulkTransfer);
+        EPLog.i(TAG, "bulkTransfer writtenByte=" + bulkTransfer);
         if (bulkTransfer < 0 && (getElapsedTime()) >= 4500.0d) {
             bulkTransfer = 0;
-            EpLog.i(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.i("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.i("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.i("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.d("EPSON", "UsbReciever ACTION_MAIN");
+                                        EPLog.d("EPSON", "UsbReciever ACTION_MAIN");
                                     } catch (Exception e) {
                                         e.printStackTrace();
                                     }
                                 }
-                                EpLog.d("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.d("EPSON", "permission denied for device");
+                    EPLog.d("EPSON", "permission denied for device");
                     if (permissionGrantedcallback != null) {
                         permissionGrantedcallback.permissionGranted(this, false);
                     }
                 } else {
-                    EpLog.i("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.i("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.i("EPSON", "HAS PERMISSION");
+            EPLog.i("EPSON", "HAS PERMISSION");
             if (usbPermissionReceiverCallback != null) {
                 usbPermissionReceiverCallback.permissionGranted(this, true);
             }

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

@@ -62,7 +62,7 @@ public class ECAvailableCheckTask extends ECBaseTask {
                     if (execute.getResponseCode() != 200) {
                         throw new IOException("health_check ResponseCode =  " + execute.getResponseCode());
                     } else if (!HEALTHCHECK_OK.equals(execute.getEntity().toString())) {
-                        EpLog.m83w(TAG, "EC Service Down");
+                        EPLog.m83w(TAG, "EC Service Down");
                         return ECStatus.ERROR_CANNOT_ENABLE;
                     } else {
                         Uri endpoint = getEndpoint();
@@ -110,7 +110,7 @@ public class ECAvailableCheckTask extends ECBaseTask {
                 return ECStatus.ERROR_UNEXPECTED;
             }
         } else {
-            EpLog.m83w(TAG, "Connected SimpleAP !!");
+            EPLog.m83w(TAG, "Connected SimpleAP !!");
             return ECStatus.ERROR_CANNOT_ENABLE;
         }
     }
@@ -119,7 +119,7 @@ public class ECAvailableCheckTask extends ECBaseTask {
         super.onPostExecute(eCStatus);
         Activity activity = (Activity) activityWeakReference.get();
         if (activity == null) {
-            EpLog.m83w(TAG, "activity is null. Maybe activity died");
+            EPLog.m83w(TAG, "activity is null. Maybe activity died");
         } else if (!mIsBLEContent) {
             if (C19985.$SwitchMap$epson$epsonconnectregistration$ECStatus[eCStatus.ordinal()] != 1) {
                 createECDialog(eCStatus);

+ 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.d(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.d(TAG, "getLang: " + str);
+        EPLog.d(TAG, "getLang: " + str);
         return str;
     }
 }

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

@@ -31,10 +31,10 @@ public class ECConfigurationTask extends ECBaseTask {
         View findViewById;
         Activity activity = (Activity) activityWeakReference.get();
         if (activity == null || (findViewById = activity.findViewById(R.id.status)) == null) {
-            EpLog.m83w(TAG, "enableProgressText Failed");
+            EPLog.m83w(TAG, "enableProgressText Failed");
             return;
         }
-        EpLog.d(TAG, "enableProgressText called");
+        EPLog.d(TAG, "enableProgressText called");
         findViewById.setVisibility(z ? 0 : 4);
     }
 
@@ -57,7 +57,7 @@ public class ECConfigurationTask extends ECBaseTask {
             if (execute.getResponseCode() == 200) {
                 soapWEBSETUPDataInfo.parseXml(new ByteArrayInputStream(execute.getEntity().toByteArray()));
                 if (!soapWEBSETUPDataInfo.getRetVal()) {
-                    EpLog.m83w(TAG, "Failed enable EC 1");
+                    EPLog.m83w(TAG, "Failed enable EC 1");
                     return ECStatus.ERROR_CANNOT_ENABLE;
                 }
                 int i = 0;
@@ -84,7 +84,7 @@ public class ECConfigurationTask extends ECBaseTask {
                     }
                 } while (i < 6);
                 if (!soapWEBSETUPDataInfo.isSucceeded()) {
-                    EpLog.m83w(TAG, "Failed enable EC 2");
+                    EPLog.m83w(TAG, "Failed enable EC 2");
                     return ECStatus.ERROR_CANNOT_ENABLE;
                 }
                 registrationUri = soapWEBSETUPDataInfo.getRegistrationUri();
@@ -105,9 +105,9 @@ public class ECConfigurationTask extends ECBaseTask {
         enableProgressText(false);
         final Activity activity = (Activity) activityWeakReference.get();
         if (activity == null) {
-            EpLog.m83w(TAG, "activity is null. Maybe activity died");
+            EPLog.m83w(TAG, "activity is null. Maybe activity died");
         } else if (ECStatus.ERROR_NONE.equals(eCStatus)) {
-            EpLog.d(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.d(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();

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

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

+ 7 - 7
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.d(TAG, "Start document");
+                EPLog.d(TAG, "Start document");
             } else if (eventType == 2) {
                 String name = newPullParser.getName();
-                EpLog.d(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,17 +55,17 @@ public abstract class SoapConfigDataParser {
                             ret = "true".equalsIgnoreCase(newPullParser.getAttributeValue((String) null, ELEMENT_RETURN));
                             z = true;
                         } else {
-                            EpLog.d(TAG, "Unexpected group" + attributeValue);
+                            EPLog.d(TAG, "Unexpected group" + attributeValue);
                         }
                     } else if (ELEMENT_D.equals(name)) {
                         str = newPullParser.getAttributeValue((String) null, "id");
                     } else {
-                        EpLog.m83w(TAG, "Unknown tag " + newPullParser.getName());
+                        EPLog.m83w(TAG, "Unknown tag " + newPullParser.getName());
                     }
                 }
             } else if (eventType == 3) {
                 String name2 = newPullParser.getName();
-                EpLog.d(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.d(TAG, "Data = " + str + " : " + text);
+                    EPLog.d(TAG, "Data = " + str + " : " + text);
                 }
             }
         }
-        EpLog.d(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.i(TAG, "Enter isUnregisteredECPrinter");
+        EPLog.i(TAG, "Enter isUnregisteredECPrinter");
         if (!getRetVal()) {
-            EpLog.i(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.i(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.i(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.i(TAG, "Enter isUnregisteredECPrinter");
+        EPLog.i(TAG, "Enter isUnregisteredECPrinter");
         if (!getRetVal()) {
-            EpLog.i(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.i(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.i(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.i(TAG, "Enter inProgress");
+        EPLog.i(TAG, "Enter inProgress");
         if (!getRetVal()) {
-            EpLog.i(TAG, "return = " + getRetVal());
+            EPLog.i(TAG, "return = " + getRetVal());
             return false;
         } else if (!RESULT_WORKING.equals(getValue(ID_SETUP_RESULT))) {
             return false;
         } else {
-            EpLog.i(TAG, "Working");
+            EPLog.i(TAG, "Working");
             return true;
         }
     }
 
     public boolean isSucceeded() {
         String value;
-        EpLog.i(TAG, "Enter isSucceeded");
+        EPLog.i(TAG, "Enter isSucceeded");
         if (!getRetVal()) {
-            EpLog.i(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.i(TAG, "Succeeded");
+            EPLog.i(TAG, "Succeeded");
             return true;
         }
     }
 
     public Uri getRegistrationUri() {
-        EpLog.i(TAG, "Enter isSucceeded");
+        EPLog.i(TAG, "Enter isSucceeded");
         if (!getRetVal()) {
-            EpLog.i(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.i(TAG, "rebuildUri = " + build);
+            EPLog.i(TAG, "rebuildUri = " + build);
             return build;
         } catch (NullPointerException e) {
             e.printStackTrace();

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

@@ -20,7 +20,7 @@ class LogUrl {
 
     public void setContextDependValue(Context context) {
         mClientId = SharedPreferencesProvider.getInstace(context).getString(Constants.PRINTER_CLIENT_ID, "");
-        EpLog.d("▲clientId = " + mClientId);
+        EPLog.d("▲clientId = " + mClientId);
         MyPrinter curPrinter = MyPrinter.getCurPrinter(context);
         mAccessKey = EcClientLibUtil.quoteForJsonString(curPrinter.getRemotePrinterAccessKey(context));
         mPrinterName = EcClientLibUtil.quoteForJsonString(curPrinter.getUserDefName(context));

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

@@ -328,7 +328,7 @@ public class MaintainActivity extends ActivityIACommon implements View.OnClickLi
     }
 
     protected void onCreate(Bundle bundle) {
-        EpLog.i(TAG, "onCreate IN");
+        EPLog.i(TAG, "onCreate IN");
         super.onCreate(bundle);
         setContentView(R.layout.maintain);
         mContext = this;
@@ -388,7 +388,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.i(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) {
@@ -1664,7 +1664,7 @@ public class MaintainActivity extends ActivityIACommon implements View.OnClickLi
                 int inkName = maintainPrinterInfo22.getInkName(i3);
                 Integer[] colorName = MediaInfo.ColorTable.getColorName(inkName);
                 if (colorName == null) {
-                    EpLog.m77i("colorNo = " + inkName);
+                    EPLog.i("colorNo = " + inkName);
                     colorName = MediaInfo.ColorTable.getColorName(Constants.ColorName.EPS_COLOR_WHITE.ordinal());
                     if (colorName != null) {
                         colorName[1] = 0;
@@ -1754,7 +1754,7 @@ public class MaintainActivity extends ActivityIACommon implements View.OnClickLi
             str3 = getString(numArr[2].intValue());
         }
         sb.append(str3);
-        EpLog.m77i(sb.toString());
+        EPLog.i(sb.toString());
     }
 
     private class CustomProDialog extends Dialog {

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

@@ -520,21 +520,21 @@ public class MaintainPrinterSearchActivity extends ActivityIACommon implements C
     protected void onResume() {
         mActivityForegroundLifetime = true;
         super.onResume();
-        EpLog.i(TAG, "onResume()");
+        EPLog.i(TAG, "onResume()");
         dismissPrinterNotFoundDialog();
         if (this.printer_location == 1) {
             mHandler.sendEmptyMessageDelayed(1, 300);
-            EpLog.d(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.e("blePrinterCheck");
+            EPLog.e("blePrinterCheck");
             callBackFuncs();
             BleAsyncTask.blePrinterCheck(this, mBleFind);
         }
     }
 
     protected void onPause() {
-        EpLog.i();
+        EPLog.i();
         super.onPause();
         mActivityForegroundLifetime = false;
         interruptSearch();
@@ -547,7 +547,7 @@ public class MaintainPrinterSearchActivity extends ActivityIACommon implements C
     }
 
     protected void onStop() {
-        EpLog.i();
+        EPLog.i();
         super.onStop();
     }
 
@@ -596,7 +596,7 @@ public class MaintainPrinterSearchActivity extends ActivityIACommon implements C
                 }
                 return;
             case 15:
-                EpLog.i();
+                EPLog.i();
                 finish();
                 return;
             default:
@@ -736,7 +736,7 @@ public class MaintainPrinterSearchActivity extends ActivityIACommon implements C
         mBleFind = new BLEUtility.BleWorkCallback() {
             public void call(Object obj) {
                 ArrayList arrayList = (ArrayList) obj;
-                EpLog.d(" ★★ mDevicelist " + arrayList.size());
+                EPLog.d(" ★★ mDevicelist " + arrayList.size());
                 if (printer_location == 1) {
                     mBleButton.setVisibility(View.VISIBLE);
                 }

+ 2 - 2
app/src/main/java/epson/print/ActivityViewImageSelect.java

@@ -904,7 +904,7 @@ public class ActivityViewImageSelect extends ActivityIACommon implements View.On
                 i3 = printSetting.sharpnessForPhoto;
                 int i9 = printSetting.paperTypeValue;
                 int code = Constants.MediaName.EPS_MTID_PLAIN.getCode();
-                EpLog.m77i("KIND = " + printSetting.getKind() + " NEW   setteing = " + i9 + " plain = " + code);
+                EPLog.i("KIND = " + printSetting.getKind() + " NEW   setteing = " + i9 + " plain = " + code);
                 i2 = (i9 == code && printSetting.getKind() == PrintSetting.Kind.photo) ? 1 : 0;
                 z = MyPrinter.isRemotePrinter(this);
             } else {
@@ -1307,7 +1307,7 @@ public class ActivityViewImageSelect extends ActivityIACommon implements View.On
         if (!isRemotePrinter) {
             int i = printSetting.paperTypeValue;
             int code = Constants.MediaName.EPS_MTID_PLAIN.getCode();
-            EpLog.m77i("setteing = " + i + "plain = " + code);
+            EPLog.i("setteing = " + i + "plain = " + code);
             return (i == code && printSetting.getKind() == PrintSetting.Kind.photo) ? 1 : 0;
         }
     }

+ 1 - 1
app/src/main/java/epson/print/IprintApplication.java

@@ -27,7 +27,7 @@ public class IprintApplication extends MultiDexApplication {
         super.onCreate();
         sInstance = this;
         EPLog.setDebuggable(false);
-        EpLog.setDebuggable(false);
+        EPLog.setDebuggable(false);
     }
 
     /**

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

@@ -93,7 +93,6 @@ public class IprintHome extends ActivityIACommon implements CommonDefine {
         public boolean handleMessage(Message message) {
             
             EPLog.i(TAG, "HandlerCallback");
-            
             switch (message.what) {
                 case 0:
                     EPLog.i(TAG, "PROBE_PRINTER");
@@ -110,9 +109,9 @@ public class IprintHome extends ActivityIACommon implements CommonDefine {
                 case 1:
                     EPLog.i(TAG, "UPDATE_PRINTER_STATUS");
                     int[] unused = mPrinterStatus = mPrinter.getMPrinterInfor().getMStatus();
-                    EpLog.d("status " + mPrinterStatus);
-                    EpLog.d("printerLocation " + printerLocation);
-                    EpLog.d("finishProbe" + finishProbe);
+                    EPLog.d("status " + mPrinterStatus);
+                    EPLog.d("printerLocation " + printerLocation);
+                    EPLog.d("finishProbe" + finishProbe);
                     String str = "";
                     if (printerLocation == 1 && WiFiDirectManager.getConnectInfo(getApplicationContext(), WiFiDirectManager.DEVICE_TYPE_PRINTER) != null) {
                         str = getString(R.string.wifi_direct_status);
@@ -190,7 +189,8 @@ public class IprintHome extends ActivityIACommon implements CommonDefine {
         menulist = (AsymmetricGridView) mLayout.findViewById(R.id.menu_list);
         printerName = (TextView) mLayout.findViewById(R.id.home_printer_name);
         printerStatus = (TextView) mLayout.findViewById(R.id.home_printer_status);
-        setContentView((View) mLayout);
+        setContentView(mLayout);
+
         setActionBar(R.string.app_name, false);
         if (mPrinter == null) {
             mPrinter = MaintainPrinter2.getInstance();
@@ -214,7 +214,7 @@ public class IprintHome extends ActivityIACommon implements CommonDefine {
         mActivityForeground = true;
         findViewById(R.id.home_select_printer).setOnClickListener(new View.OnClickListener() {
             public void onClick(View view) {
-                Intent intent = new Intent(this, MaintainActivity.class);
+                Intent intent = new Intent(IprintHome.this, MaintainActivity.class);
                 intent.setAction("android.intent.action.VIEW");
                 startActivity(intent);
                 Analytics.sendAction(getApplicationContext(), Analytics.ACTION_ID_HOME_MAINTAIN);
@@ -289,7 +289,7 @@ public class IprintHome extends ActivityIACommon implements CommonDefine {
 
     protected void onResume() {
         EPLog.i(TAG, "onResume()");
-        EpLog.i();
+        EPLog.i();
         super.onResume();
         ExternalFileUtils.getInstance(this).initTempViewDir();
         ExternalFileUtils.getInstance(this).initTempCRDir();
@@ -359,7 +359,7 @@ public class IprintHome extends ActivityIACommon implements CommonDefine {
     }
 
     private void updatePrinterInfo() {
-        EpLog.d(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.d(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.d(TAG, "########################");
+            EPLog.d(TAG, "########################");
             mHandler.sendEmptyMessage(1);
             return;
         }
-        EpLog.d(TAG, "@@@@@@@@@@@@@@@@@@@@@@");
+        EPLog.d(TAG, "@@@@@@@@@@@@@@@@@@@@@@");
         mHandler.sendEmptyMessage(0);
     }
 

+ 1 - 1
app/src/main/java/epson/print/WellcomeScreenActivity.java

@@ -24,7 +24,7 @@ public class WellcomeScreenActivity extends AppCompatActivity {
 
             public void run() {
                 try {
-                    sleep(2000);
+                    sleep(1000);
                 } catch (InterruptedException e) {
                     e.printStackTrace();
                 }

+ 3 - 3
app/src/main/java/epson/print/ecclient/EpsonConnectAccess.java

@@ -1,7 +1,7 @@
 package epson.print.ecclient;
 
 import android.content.Context;
-import com.epson.mobilephone.common.EpLog;
+import com.epson.mobilephone.common.EPLog;
 import epson.common.Constants;
 import epson.provider.SharedPreferencesProvider;
 
@@ -167,7 +167,7 @@ public class EpsonConnectAccess {
 
     static String loadClientId(Context context) {
         String string = SharedPreferencesProvider.getInstace(context).getString(Constants.PRINTER_CLIENT_ID, (String) null);
-        EpLog.d("▲clientId = " + string);
+        EPLog.d("▲clientId = " + string);
         if (string == null || string.length() <= 0) {
             return null;
         }
@@ -175,7 +175,7 @@ public class EpsonConnectAccess {
     }
 
     static void saveClientId(Context context, String str) {
-        EpLog.d("▲ save  clientId = " + str);
+        EPLog.d("▲ save  clientId = " + str);
         SharedPreferencesProvider.getInstace(context).edit().putString(Constants.PRINTER_CLIENT_ID, str).apply();
     }
 

+ 2 - 2
app/src/main/java/epson/print/screen/PaperSourceInfo.java

@@ -3,7 +3,7 @@ package epson.print.screen;
 import android.content.Context;
 import android.os.AsyncTask;
 import android.os.Handler;
-import com.epson.mobilephone.common.EpLog;
+import com.epson.mobilephone.common.EPLog;
 import com.epson.mobilephone.common.maintain2.MaintainPrinter2;
 import epson.print.Util.EPLog;
 import java.util.ArrayList;
@@ -19,7 +19,7 @@ public class PaperSourceInfo {
     private PaparInfoTask paparInfoTask = null;
 
     private PaperSourceInfo(Context context) {
-        EpLog.i();
+        EPLog.i();
         this.mPrinter.doInitDriver(context, 2);
     }
 

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

@@ -6,7 +6,7 @@ import android.content.SharedPreferences;
 import android.database.Cursor;
 import android.net.Uri;
 import com.box.androidsdk.content.requests.BoxRequestsMetadata;
-import com.epson.mobilephone.common.EpLog;
+import com.epson.mobilephone.common.EPLog;
 import com.epson.mobilephone.common.PrintingLib.define.Constants;
 import com.epson.mobilephone.common.escpr.MediaInfo;
 import epson.common.Constants;
@@ -137,7 +137,7 @@ public class PrintSetting {
             Cursor query = IprintApplication.getInstance().getContentResolver().query(Uri.parse("content://epson.print.provider.SharedPreferences/"), (String[]) null, (String) null, (String[]) null, (String) null);
             query.moveToFirst();
             this.allValueFromContentProvider.clear();
-            EpLog.i();
+            EPLog.i();
             String str = null;
             Object obj = null;
             do {
@@ -146,7 +146,7 @@ public class PrintSetting {
                     if (columnName.equals("key")) {
                         str = query.getString(i);
                     } else if (columnName.equals(BoxRequestsMetadata.UpdateItemMetadata.BoxMetadataUpdateTask.VALUE)) {
-                        EpLog.i("さーびす", "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) {

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

@@ -24,7 +24,7 @@ import android.widget.ListView;
 import android.widget.ProgressBar;
 import android.widget.RadioButton;
 import android.widget.TextView;
-import com.epson.mobilephone.common.EpLog;
+import com.epson.mobilephone.common.EPLog;
 import com.epson.mobilephone.common.escpr.MediaInfo;
 import com.epson.mobilephone.common.wifidirect.ActivityWiFiDirectStart;
 import com.epson.mobilephone.common.wifidirect.ActivityiPrintConnect;
@@ -114,7 +114,7 @@ public class SearchPrinterScr extends ActivityIACommon implements CustomTitleDia
         }
 
         public void onFindPrinterResult(String str, String str2, String str3, String str4, String str5) throws RemoteException {
-            EpLog.m77i(str);
+            EPLog.i(str);
             int access$200 = SearchPrinterScr.this.printer_location;
             if (access$200 == 1) {
                 Message obtain = Message.obtain();

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

@@ -13,7 +13,7 @@ import android.os.RemoteException;
 import com.epson.cameracopy.printlayout.ImageAndLayout;
 import com.epson.iprint.apf.ApfEpImageAdapter;
 import com.epson.iprint.storage.StorageSecureStore;
-import com.epson.mobilephone.common.EpLog;
+import com.epson.mobilephone.common.EPLog;
 import com.epson.mobilephone.common.PrintingLib.define.Constants;
 import com.epson.mobilephone.common.escpr.EscprError;
 import com.epson.mobilephone.common.escpr.EscprLib;
@@ -177,7 +177,7 @@ public class EpsonService extends Service implements ApfEpImageAdapter.ProgressC
         }
 
         public void setTimeOut(int i) throws RemoteException {
-            EpLog.d("EpsonService", "timeout = " + i);
+            EPLog.d("EpsonService", "timeout = " + i);
             int unused = EpsonService.this.timeout_sec = i;
         }
 
@@ -195,9 +195,9 @@ public class EpsonService extends Service implements ApfEpImageAdapter.ProgressC
         }
 
         public int print(EPImageList ePImageList, String str, boolean z) throws RemoteException {
-            EpLog.i();
+            EPLog.i();
             boolean z2 = SharedPreferencesProvider.getInstace(EpsonService.this).getInt(Constants.PRINTER_LOCATION, 0) == 2;
-            EpLog.m77i("☆☆     isRemotePrinter  " + z2);
+            EPLog.i("☆☆     isRemotePrinter  " + z2);
             PrintSetting.Kind valueOf = PrintSetting.Kind.valueOf(str);
             if (z2) {
                 int unused = EpsonService.this.createECPrintingThread(valueOf, ePImageList);
@@ -386,7 +386,7 @@ public class EpsonService extends Service implements ApfEpImageAdapter.ProgressC
             int i5;
             int i6;
             int i7;
-            EpLog.m83w("EpsonService", "call updatePrinterSettings() :: " + Binder.getCallingPid());
+            EPLog.m83w("EpsonService", "call updatePrinterSettings() :: " + Binder.getCallingPid());
             PrintSetting printSetting = new PrintSetting(EpsonService.this, PrintSetting.Kind.valueOf(str));
             printSetting.loadSettings();
             int i8 = printSetting.paperSizeValue;
@@ -641,7 +641,7 @@ public class EpsonService extends Service implements ApfEpImageAdapter.ProgressC
             boolean z2;
             int i2;
             int i3;
-            EpLog.d("EpsonService", "EpsonConnectUpdatePrinterSettings() called.");
+            EPLog.d("EpsonService", "EpsonConnectUpdatePrinterSettings() called.");
             PrintSetting instance = PrintSetting.getInstance(EpsonService.this, str);
             instance.loadSettings();
             int i4 = instance.paperSizeValue;
@@ -1101,7 +1101,7 @@ public class EpsonService extends Service implements ApfEpImageAdapter.ProgressC
 
     public void epsNotifyDataChange(String str) {
         String str2;
-        EpLog.d(" *****************  epsNotifyDataChange() call: " + str);
+        EPLog.d(" *****************  epsNotifyDataChange() call: " + str);
         String str3 = "";
         String str4 = "";
         String[] split = str.split("\\|\\|");
@@ -1153,7 +1153,7 @@ public class EpsonService extends Service implements ApfEpImageAdapter.ProgressC
     private void updateLoginInfo() {
         clearRemotePrinterInfo();
         this.clientId = SharedPreferencesProvider.getInstace(this).getString(epson.common.Constants.PRINTER_CLIENT_ID, (String) null);
-        EpLog.d("▲clientId = " + this.clientId);
+        EPLog.d("▲clientId = " + this.clientId);
         MyPrinter curPrinter = MyPrinter.getCurPrinter(this);
         this.mailAddress = curPrinter.getEmailAddress();
         this.accessKey = curPrinter.getRemotePrinterAccessKey(this);
@@ -1261,7 +1261,7 @@ public class EpsonService extends Service implements ApfEpImageAdapter.ProgressC
                 r2.append(r3)
                 r2.append(r4)
                 java.lang.String r2 = r2.toString()
-                com.epson.mobilephone.common.EpLog.d(r2)
+                com.epson.mobilephone.common.EPLog.d(r2)
                 epson.print.service.EpsonService r2 = epson.print.service.EpsonService.this
                 com.epson.mobilephone.common.escpr.EscprLib r2 = r2.mEscprLib
                 epson.print.service.EpsonService r3 = epson.print.service.EpsonService.this
@@ -1390,7 +1390,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.d(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 }
@@ -2098,7 +2098,7 @@ public class EpsonService extends Service implements ApfEpImageAdapter.ProgressC
             r0 = r20
             r2 = r22
             r9 = r23
-            com.epson.mobilephone.common.EpLog.m68d()
+            com.epson.mobilephone.common.EPLog.m68d()
             epson.print.EPImage r15 = r18.get(r19)
             epson.print.EPImageCreator r3 = new epson.print.EPImageCreator
             android.content.Context r4 = r17.getApplicationContext()
@@ -2122,7 +2122,7 @@ public class EpsonService extends Service implements ApfEpImageAdapter.ProgressC
             r6.append(r7)     // Catch:{ Exception -> 0x022f }
             r6.append(r13)     // Catch:{ Exception -> 0x022f }
             java.lang.String r6 = r6.toString()     // Catch:{ Exception -> 0x022f }
-            com.epson.mobilephone.common.EpLog.m77i(r6)     // Catch:{ Exception -> 0x022f }
+            com.epson.mobilephone.common.EPLog.i(r6)     // Catch:{ Exception -> 0x022f }
             r6 = 2
             r7 = 0
             if (r13 != r5) goto L_0x00e2
@@ -2376,7 +2376,7 @@ public class EpsonService extends Service implements ApfEpImageAdapter.ProgressC
         L_0x01e1:
             if (r24 == 0) goto L_0x020a
             java.lang.String r2 = "割り付け画像を生成"
-            com.epson.mobilephone.common.EpLog.d(r2)     // Catch:{ Exception -> 0x022f }
+            com.epson.mobilephone.common.EPLog.d(r2)     // Catch:{ Exception -> 0x022f }
             android.content.Context r4 = r17.getApplicationContext()     // Catch:{ Exception -> 0x022f }
             r9 = r8[r7]     // Catch:{ Exception -> 0x022f }
             r10 = r8[r5]     // Catch:{ Exception -> 0x022f }
@@ -2583,12 +2583,12 @@ public class EpsonService extends Service implements ApfEpImageAdapter.ProgressC
     }
 
     public void onCreate() {
-        EpLog.i();
+        EPLog.i();
         super.onCreate();
     }
 
     public IBinder onBind(Intent intent) {
-        EpLog.i();
+        EPLog.i();
         try {
             if (!isInitDriver) {
                 this.mEscprLib.init_driver(getApplicationContext(), ExternalFileUtils.getInstance(getApplicationContext()).getSupportedMediaDir());
@@ -2602,13 +2602,13 @@ public class EpsonService extends Service implements ApfEpImageAdapter.ProgressC
     }
 
     public void onRebind(Intent intent) {
-        EpLog.i();
+        EPLog.i();
         this.mEscprLib.release_driver();
         isInitDriver = false;
         this.mEscprLib.init_driver(getApplicationContext(), ExternalFileUtils.getInstance(getApplicationContext()).getSupportedMediaDir());
         isInitDriver = true;
         this.clientId = SharedPreferencesProvider.getInstace(this).getString(epson.common.Constants.PRINTER_CLIENT_ID, (String) null);
-        EpLog.d("▲clientId = " + this.clientId);
+        EPLog.d("▲clientId = " + this.clientId);
         MyPrinter curPrinter = MyPrinter.getCurPrinter(this);
         this.mailAddress = curPrinter.getEmailAddress();
         this.accessKey = curPrinter.getRemotePrinterAccessKey(this);
@@ -2616,7 +2616,7 @@ public class EpsonService extends Service implements ApfEpImageAdapter.ProgressC
     }
 
     public boolean onUnbind(Intent intent) {
-        EpLog.i();
+        EPLog.i();
         this.mEscprLib.setHanlder((Handler) null);
         this.mEscprLib.release_driver();
         isInitDriver = false;
@@ -2624,7 +2624,7 @@ public class EpsonService extends Service implements ApfEpImageAdapter.ProgressC
     }
 
     public void onDestroy() {
-        EpLog.i();
+        EPLog.i();
         super.onDestroy();
     }
 

+ 1 - 1
app/src/main/java/epson/print/service/LocalPrintThread.java

@@ -312,7 +312,7 @@ public class LocalPrintThread extends Thread {
             boolean r11 = r1.mIsBkRetry     // Catch:{ LocalInterrupt | InterruptedException -> 0x0480, LocalEscprException -> 0x03ca, Exception -> 0x0369, all -> 0x035b }
             r4.append(r11)     // Catch:{ LocalInterrupt | InterruptedException -> 0x0480, LocalEscprException -> 0x03ca, Exception -> 0x0369, all -> 0x035b }
             java.lang.String r4 = r4.toString()     // Catch:{ LocalInterrupt | InterruptedException -> 0x0480, LocalEscprException -> 0x03ca, Exception -> 0x0369, all -> 0x035b }
-            com.epson.mobilephone.common.EpLog.d(r4)     // Catch:{ LocalInterrupt | InterruptedException -> 0x0480, LocalEscprException -> 0x03ca, Exception -> 0x0369, all -> 0x035b }
+            com.epson.mobilephone.common.EPLog.d(r4)     // Catch:{ LocalInterrupt | InterruptedException -> 0x0480, LocalEscprException -> 0x03ca, Exception -> 0x0369, all -> 0x035b }
             epson.print.service.PrintService r4 = r1.mEpsonService     // Catch:{ LocalInterrupt | InterruptedException -> 0x0480, LocalEscprException -> 0x03ca, Exception -> 0x0369, all -> 0x035b }
             boolean r12 = r1.mIsBkRetry     // Catch:{ LocalInterrupt | InterruptedException -> 0x0480, LocalEscprException -> 0x03ca, Exception -> 0x0369, all -> 0x035b }
             r11 = 40

+ 5 - 5
app/src/main/java/epson/provider/SharedPreferencesProvider.java

@@ -139,16 +139,16 @@ public class SharedPreferencesProvider extends ContentProvider {
 
     public Uri insert(Uri uri, ContentValues contentValues) {
         SharedPreferences.Editor editor;
-        EpLog.m77i("ContentValues     #######         " + contentValues);
+        EPLog.i("ContentValues     #######         " + contentValues);
         checkPermission(Binder.getCallingPid());
         switch (matcher.match(uri)) {
             case 65536:
                 editor = mPrefs.edit();
-                EpLog.m77i(" !!!!!!!!    MATCH_DATA        !!!!!!!!!!!");
+                EPLog.i(" !!!!!!!!    MATCH_DATA        !!!!!!!!!!!");
                 break;
             case 65537:
                 editor = getContext().getSharedPreferences(AnalyticsPreferences.PREFS_NAME, 0).edit();
-                EpLog.m77i(" !!!!!!!!    MATCH_DATA_ANALYTICS        !!!!!!!!!!!");
+                EPLog.i(" !!!!!!!!    MATCH_DATA_ANALYTICS        !!!!!!!!!!!");
                 break;
             default:
                 throw new IllegalArgumentException("Unsupported uri " + uri);
@@ -392,7 +392,7 @@ public class SharedPreferencesProvider extends ContentProvider {
             init(context);
         }
         Uri build = BASE_URI.buildUpon().appendPath(str).appendPath(str2).build();
-        EpLog.d("URI = " + build.toString());
+        EPLog.d("URI = " + build.toString());
         return build;
     }
 
@@ -401,7 +401,7 @@ public class SharedPreferencesProvider extends ContentProvider {
             init(context);
         }
         Uri build = BASE_URI.buildUpon().appendPath(str).appendPath(str).appendPath(str).build();
-        EpLog.d("URI = " + build.toString());
+        EPLog.d("URI = " + build.toString());
         return build;
     }
 }

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

@@ -68,7 +68,7 @@ public class DeviceInformationActivity extends ActivityIACommon {
                 case 0:
                     EPLog.i(TAG, "UPDATE_PRINTER_STATUS");
                     int[] mStatus = mPrinter.getMPrinterInfor().getMStatus();
-                    EpLog.d("status " + mStatus[0]);
+                    EPLog.d("status " + mStatus[0]);
                     if (i == 1 && WiFiDirectManager.getConnectInfo(getApplicationContext(), WiFiDirectManager.DEVICE_TYPE_PRINTER) != null) {
                         str = getString(R.string.wifi_direct_status);
                         z = true;
@@ -193,12 +193,12 @@ public class DeviceInformationActivity extends ActivityIACommon {
             showLoadProgressBar();
             if (location == 1 || (location == 3 && Utils.isConnectedWifi(getApplicationContext()))) {
                 ManageDefaultNetwork.getInstance(this).setDefaultNetworkSimpleAp();
-                EpLog.d("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.d("IprintHome", "Update printer status without execute Probing ");
+            EPLog.d("IprintHome", "Update printer status without execute Probing ");
             sendUpdatePrinterStatus(mHandler, location);
         }
     }
@@ -253,7 +253,7 @@ public class DeviceInformationActivity extends ActivityIACommon {
         try {
             return InetAddress.getByAddress(BigInteger.valueOf((long) ipAddress).toByteArray()).getHostAddress();
         } catch (UnknownHostException unused) {
-            EpLog.m72e(this.TAG, "Unable to get host address.");
+            EPLog.m72e(this.TAG, "Unable to get host address.");
             return null;
         }
     }
@@ -310,7 +310,7 @@ public class DeviceInformationActivity extends ActivityIACommon {
         }
 
         protected Boolean doInBackground(Context... contextArr) {
-            EpLog.m77i("ProbePrinter doInBackground");
+            EPLog.i("ProbePrinter doInBackground");
             mPrinter.doInitDriver(contextArr[0], 2);
             mPrinterLocation = mMyPrinter.getLocation();
             int i = mPrinterLocation;
@@ -322,13 +322,13 @@ public class DeviceInformationActivity extends ActivityIACommon {
                     return false;
                 } else {
                     int doSetPrinter = mPrinter.doSetPrinter();
-                    EpLog.m77i("Set Printer result: " + doSetPrinter);
+                    EPLog.i("Set Printer result: " + doSetPrinter);
                     if (doSetPrinter != 0) {
                         localSendMessage(1);
                         return false;
                     }
                     int doGetStatus = mPrinter.doGetStatus();
-                    EpLog.m77i("Printer Status result: " + doGetStatus);
+                    EPLog.i("Printer Status result: " + doGetStatus);
                     if (doGetStatus != 0) {
                         localSendMessage(1);
                         return false;
@@ -369,12 +369,12 @@ public class DeviceInformationActivity extends ActivityIACommon {
         }
 
         protected void onCancelled() {
-            EpLog.m77i("ProbePrinter onCancelled");
+            EPLog.i("ProbePrinter onCancelled");
             super.onCancelled();
         }
 
         protected void onPostExecute(Boolean bool) {
-            EpLog.m77i("ProbePrinter onPostExecute");
+            EPLog.i("ProbePrinter onPostExecute");
             if (bool.booleanValue()) {
                 sendUpdatePrinterStatus((Handler) mHandlerReference.get(), mPrinterLocation);
             }