liuyuqi-dellpc 3 years ago
parent
commit
eb92ad3de1

+ 2 - 0
app/src/main/java/com/epson/cameracopy/ui/CameraPreviewFragment.java

@@ -16,6 +16,8 @@ import android.view.ViewGroup;
 import android.view.WindowManager;
 import android.widget.Button;
 
+import androidx.fragment.app.Fragment;
+
 import com.epson.cameracopy.alt.FileUtils;
 import com.epson.cameracopy.alt.UiCommon;
 import com.epson.cameracopy.device.AptSensorAdapter;

+ 4 - 4
app/src/main/java/com/epson/cameracopy/ui/CameraPrintSettingActivity.java

@@ -158,7 +158,7 @@ public class CameraPrintSettingActivity extends ActivityIACommon implements View
     private Context mContext = null;
     private final ServiceConnection mEpsonConnection = new ServiceConnection() {
         public void onServiceDisconnected(ComponentName componentName) {
-            EPLog.m316v("SettingScr", "onServiceDisconnected");
+            EPLog.v("SettingScr", "onServiceDisconnected");
             try {
                 CameraPrintSettingActivity.mEpsonService.unregisterCallback(CameraPrintSettingActivity.mCallback);
             } catch (RemoteException e) {
@@ -169,7 +169,7 @@ public class CameraPrintSettingActivity extends ActivityIACommon implements View
 
         public void onServiceConnected(ComponentName componentName, IBinder iBinder) {
             IEpsonService unused = CameraPrintSettingActivity.mEpsonService = IEpsonService.Stub.asInterface(iBinder);
-            EPLog.m316v("SettingScr", "onServiceConnected");
+            EPLog.v("SettingScr", "onServiceConnected");
             if (CameraPrintSettingActivity.mEpsonService != null) {
                 try {
                     CameraPrintSettingActivity.mEpsonService.registerCallback(CameraPrintSettingActivity.mCallback);
@@ -605,14 +605,14 @@ public class CameraPrintSettingActivity extends ActivityIACommon implements View
     }
 
     private void bindEpsonService() {
-        EPLog.m316v("SettingScr", "bindEpsonService");
+        EPLog.v("SettingScr", "bindEpsonService");
         if (mEpsonService == null) {
             bindService(new Intent(this, EpsonService.class), mEpsonConnection, 1);
         }
     }
 
     private void unbindEpsonService() {
-        EPLog.m316v("SettingScr", "unbindEpsonService");
+        EPLog.v("SettingScr", "unbindEpsonService");
         IEpsonService iEpsonService = mEpsonService;
         if (iEpsonService != null) {
             try {

+ 5 - 2
app/src/main/java/com/epson/cameracopy/ui/ImageFolderFileViewModel.java

@@ -5,6 +5,9 @@ import android.arch.lifecycle.AndroidViewModel;
 import android.arch.lifecycle.LiveData;
 import android.os.AsyncTask;
 
+import androidx.annotation.NonNull;
+import androidx.lifecycle.AndroidViewModel;
+
 
 /* renamed from: com.epson.cameracopy.ui.ImageFolderFileViewModel */
 public class ImageFolderFileViewModel extends AndroidViewModel {
@@ -32,7 +35,7 @@ public class ImageFolderFileViewModel extends AndroidViewModel {
         public void setImageFolderFile(@NonNull final ImageFolderFile imageFolderFile) {
             new AsyncTask<Void, Void, ImageFolderFile>() {
                 protected void onPostExecute(ImageFolderFile imageFolderFile) {
-                    ImageFolderFileViewModel.mImageFolderFileLiveData.setValue(imageFolderFile);
+                    mImageFolderFileLiveData.setValue(imageFolderFile);
                 }
 
                 protected ImageFolderFile doInBackground(Void... voidArr) {
@@ -40,7 +43,7 @@ public class ImageFolderFileViewModel extends AndroidViewModel {
                     if (imageFolderFile == null) {
                         return null;
                     }
-                    imageFolderFile.prepareImage(ImageFolderFileViewModel.mApplication);
+                    imageFolderFile.prepareImage(mApplication);
                     return imageFolderFile;
                 }
             }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, new Void[0]);

+ 1 - 1
app/src/main/java/com/epson/cameracopy/ui/PrintPreviewActivity.java

@@ -497,7 +497,7 @@ public class PrintPreviewActivity extends ActivityIACommon implements CommonDefi
     }
 
     protected void onDestroy() {
-        EPLog.m316v("ActivityImageViewSelect", "onDestroy");
+        EPLog.v("ActivityImageViewSelect", "onDestroy");
         super.onDestroy();
         IEpsonService iEpsonService = mEpsonService;
         if (iEpsonService != null) {

+ 4 - 4
app/src/main/java/com/epson/memcardacc/AltViewImageAdapter.java

@@ -70,7 +70,7 @@ public class AltViewImageAdapter extends BaseAdapter implements CommonDefine {
             try {
                 imageItem = mImageItemList.get(i);
             } catch (NullPointerException e) {
-                EPLog.m316v("null pointer Exception", "line 46 <> View Image Adapter");
+                EPLog.v("null pointer Exception", "line 46 <> View Image Adapter");
                 e.printStackTrace();
                 return relativeLayout;
             }
@@ -84,10 +84,10 @@ public class AltViewImageAdapter extends BaseAdapter implements CommonDefine {
             } else {
                 imageView.setImageBitmap((Bitmap) null);
                 imageView.setBackgroundColor(-3355444);
-                EPLog.m316v("null", "bitmap is null");
+                EPLog.v("null", "bitmap is null");
             }
         } catch (NullPointerException e2) {
-            EPLog.m316v("null pointer Exception", "line 61 <> View Image Adapter");
+            EPLog.v("null pointer Exception", "line 61 <> View Image Adapter");
             e2.printStackTrace();
         }
         try {
@@ -114,7 +114,7 @@ public class AltViewImageAdapter extends BaseAdapter implements CommonDefine {
                 imageView2.setVisibility(4);
             }
         } catch (NullPointerException e4) {
-            EPLog.m316v("null pointer Exception", "line 73 <> View Image Adapter");
+            EPLog.v("null pointer Exception", "line 73 <> View Image Adapter");
             e4.printStackTrace();
         }
         return relativeLayout;

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

@@ -171,7 +171,7 @@ public class CifsAccess {
         }
         try {
             int connectStrageNative = sCifsLib.connectStrageNative(getZZTermUtf16Bin(str), str2, str3);
-            EPLog.m316v("CifsAccess", "@@@return <" + connectStrageNative + ">");
+            EPLog.v("CifsAccess", "@@@return <" + connectStrageNative + ">");
             return connectStrageNative;
         } catch (UnsupportedEncodingException e) {
             e.printStackTrace();

+ 2 - 2
app/src/main/java/epson/common/Info_paper.java

@@ -218,13 +218,13 @@ public class Info_paper {
                 if (r6 != 0) goto L_0x0025
                 java.lang.String r0 = "Info_paper"
                 java.lang.String r1 = "Use cache areaInfo"
-                epson.print.Util.EPLog.m316v(r0, r1)
+                epson.print.Util.EPLog.v(r0, r1)
                 java.util.Hashtable<java.lang.Integer, epson.common.Info_paper> r0 = areaInfoCache
                 return r0
             L_0x0025:
                 java.lang.String r2 = "Info_paper"
                 java.lang.String r3 = "Read areaInfo file"
-                epson.print.Util.EPLog.m316v(r2, r3)
+                epson.print.Util.EPLog.v(r2, r3)
                 r3 = 4
                 byte[] r4 = new byte[r3]     // Catch:{ FileNotFoundException -> 0x0168, IOException -> 0x0155, all -> 0x0152 }
                 java.io.BufferedInputStream r5 = new java.io.BufferedInputStream     // Catch:{ FileNotFoundException -> 0x0168, IOException -> 0x0155, all -> 0x0152 }

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

@@ -556,13 +556,13 @@ public class ActivityNfcPrinter extends Activity {
     }
 
     protected void onResume() {
-        EPLog.m316v(TAG, "onResume status=" + status.toString());
+        EPLog.v(TAG, "onResume status=" + status.toString());
         super.onResume();
         NfcTagUtils.enableForegroundDispatch(this, (IntentFilter[]) null, (String[][]) null);
     }
 
     protected void onPause() {
-        EPLog.m316v(TAG, "onPause");
+        EPLog.v(TAG, "onPause");
         super.onPause();
         NfcTagUtils.disableForegroundDispatch(this);
     }

+ 8 - 8
app/src/main/java/epson/print/ActivityPrintWeb.java

@@ -205,7 +205,7 @@ public class ActivityPrintWeb extends ActivityIACommon implements CommonDefine,
                                 ActivityPrintWeb.this.check3GAndStartPrint();
                                 return;
                             case 5:
-                                EPLog.m316v(ActivityPrintWeb.TAG, "INIT");
+                                EPLog.v(ActivityPrintWeb.TAG, "INIT");
                                 if (ActivityPrintWeb.mEpsonService == null) {
                                     sendEmptyMessageDelayed(5, 100);
                                     return;
@@ -687,7 +687,7 @@ public class ActivityPrintWeb extends ActivityIACommon implements CommonDefine,
     }
 
     protected void onResume() {
-        EPLog.m316v(TAG, "onResume()");
+        EPLog.v(TAG, "onResume()");
         super.onResume();
         NfcTagUtils.enableForegroundDispatch(this, (IntentFilter[]) null, (String[][]) null);
         paperMissmath.setVisibility(View.GONE);
@@ -728,7 +728,7 @@ public class ActivityPrintWeb extends ActivityIACommon implements CommonDefine,
     }
 
     protected void onActivityResult(int i, int i2, Intent intent) {
-        EPLog.m316v(TAG, "onActivityResult requestCode = " + i);
+        EPLog.v(TAG, "onActivityResult requestCode = " + i);
         if (i != 255) {
             switch (i) {
                 case 5:
@@ -750,9 +750,9 @@ public class ActivityPrintWeb extends ActivityIACommon implements CommonDefine,
                     return;
             }
         } else {
-            EPLog.m316v(TAG, "onActivityResult resultCode = " + i2);
+            EPLog.v(TAG, "onActivityResult resultCode = " + i2);
             if (i2 == 0) {
-                EPLog.m316v(TAG, "finish print = RESULT_CANCELED");
+                EPLog.v(TAG, "finish print = RESULT_CANCELED");
                 if (this.isCustomAction) {
                     setResult(0);
                     finish();
@@ -760,14 +760,14 @@ public class ActivityPrintWeb extends ActivityIACommon implements CommonDefine,
                 }
             } else if (i2 != 4) {
                 if (i2 == 1000) {
-                    EPLog.m316v(TAG, "finish print = RESULT_ERROR");
+                    EPLog.v(TAG, "finish print = RESULT_ERROR");
                 }
                 mPrint.setEnabled(true);
             }
-            EPLog.m316v(TAG, "finish print = END_PRINT");
+            EPLog.v(TAG, "finish print = END_PRINT");
             mReviewInvitationViewModel.onPrintEnd(PrintProgress.isPrintSuccess(i2));
             if (this.isCustomAction) {
-                EPLog.m316v(TAG, "*****isCustomAction");
+                EPLog.v(TAG, "*****isCustomAction");
                 setResult(-1);
                 finish();
                 return;

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

@@ -1702,7 +1702,7 @@ public class EPImageCreator implements CommonDefine {
         if (str2 != null) {
             try {
                 int length = str.length() * fontSize;
-                EPLog.m316v("drawTextToImage", "font_size=" + fontSize + " width=" + length + " height=" + fontSize);
+                EPLog.v("drawTextToImage", "font_size=" + fontSize + " width=" + length + " height=" + fontSize);
                 if (length <= 0 || fontSize <= 0) {
                     throw new Exception();
                 }

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

@@ -89,10 +89,10 @@ public class GalleryAdapter extends BaseAdapter {
                 e.printStackTrace();
                 imageView.setImageBitmap((Bitmap) null);
             } catch (IndexOutOfBoundsException unused) {
-                EPLog.m316v("index out of bounds exception in set Bitmap", "ij");
+                EPLog.v("index out of bounds exception in set Bitmap", "ij");
                 imageView.setImageBitmap((Bitmap) null);
             } catch (OutOfMemoryError e2) {
-                EPLog.m316v("err exeption", "line 240 <> EPImageList");
+                EPLog.v("err exeption", "line 240 <> EPImageList");
                 e2.printStackTrace();
                 imageView.setImageResource(R.drawable.icon_android);
             }

+ 125 - 122
app/src/main/java/epson/print/WebviewActivity.java

@@ -38,6 +38,9 @@ import android.widget.ImageButton;
 import android.widget.LinearLayout;
 import android.widget.Toast;
 
+import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
+
 import com.box.androidsdk.content.models.BoxFile;
 import com.box.androidsdk.content.requests.BoxRequestsMetadata;
 import com.epson.iprint.prtlogger.Analytics;
@@ -116,76 +119,76 @@ public class WebviewActivity extends ActivityIACommon implements CommonDefine, V
         }
 
         public void onPageStarted(WebView webView, String str, Bitmap bitmap) {
-            if (!WebviewActivity.this.checkSharepage) {
-                WebviewActivity.mLoadWebLayout.setVisibility(View.VISIBLE);
+            if (!checkSharepage) {
+                mLoadWebLayout.setVisibility(View.VISIBLE);
             } else {
-                WebviewActivity.this.showLoadingDialog();
+                showLoadingDialog();
             }
             WebviewActivity webviewActivity = WebviewActivity.this;
-            webviewActivity.setTextOnUrlEditText(webviewActivity.fixUrl(str));
-            boolean unused = WebviewActivity.mIsFinish = false;
-            boolean unused2 = WebviewActivity.mCanStop = true;
-            WebviewActivity.this.setClearButtonAppearance(0);
-            boolean unused3 = WebviewActivity.mCanRefresh = false;
-            WebviewActivity.this.invalidateOptionsMenu();
+            setTextOnUrlEditText(fixUrl(str));
+            boolean unused = mIsFinish = false;
+            boolean unused2 = mCanStop = true;
+            setClearButtonAppearance(0);
+            boolean unused3 = mCanRefresh = false;
+            invalidateOptionsMenu();
         }
 
         public void onPageFinished(WebView webView, String str) {
             boolean z;
             Map<String, ?> all;
-            EPLog.d(WebviewActivity.TAG, "onPageFinished: " + str);
-            boolean unused = WebviewActivity.mIsFinish = true;
-            boolean unused2 = WebviewActivity.mCanRefresh = true;
-            boolean unused3 = WebviewActivity.mCanStop = false;
-            WebviewActivity.this.setClearButtonAppearance(1);
-            if (!WebviewActivity.this.getTitle().toString().equals("Web page not available")) {
-                String unused4 = WebviewActivity.this.strUrlIn = str;
-                String unused5 = WebviewActivity.this.inURL = null;
-                WebviewActivity.mIsLoadError = false;
+            EPLog.d(TAG, "onPageFinished: " + str);
+            boolean unused = mIsFinish = true;
+            boolean unused2 = mCanRefresh = true;
+            boolean unused3 = mCanStop = false;
+            setClearButtonAppearance(1);
+            if (!getTitle().toString().equals("Web page not available")) {
+                String unused4 = strUrlIn = str;
+                String unused5 = inURL = null;
+                mIsLoadError = false;
             } else {
-                WebviewActivity.mIsLoadError = true;
+                mIsLoadError = true;
             }
-            WebviewActivity.this.invalidateOptionsMenu();
-            if (!WebviewActivity.this.isBuy && !WebviewActivity.this.isFaq && !WebviewActivity.this.isInfo) {
-                WebviewActivity.mStrictMode.permitAll();
+            invalidateOptionsMenu();
+            if (!isBuy && !isFaq && !isInfo) {
+                mStrictMode.permitAll();
                 WebviewActivity webviewActivity = WebviewActivity.this;
-                SharedPreferences unused6 = webviewActivity.statePre = webviewActivity.getSharedPreferences("history", 0);
-                if (WebviewActivity.mIsFistLoad || (all = WebviewActivity.this.statePre.getAll()) == null) {
+                SharedPreferences unused6 = statePre = getSharedPreferences("history", 0);
+                if (mIsFistLoad || (all = statePre.getAll()) == null) {
                     z = false;
                 } else {
-                    WebviewActivity.mListUrl.clear();
+                    mListUrl.clear();
                     for (String next : all.keySet()) {
                         HashMap hashMap = new HashMap();
                         hashMap.put("key", next);
                         hashMap.put(BoxRequestsMetadata.UpdateItemMetadata.BoxMetadataUpdateTask.VALUE, all.get(next).toString());
-                        WebviewActivity.mListUrl.add(hashMap);
+                        mListUrl.add(hashMap);
                     }
                     WebviewActivity webviewActivity2 = WebviewActivity.this;
                     int unused7 = webviewActivity2.countUrl = webviewActivity2.mListUrl.size();
                     z = false;
-                    for (int i = 0; i < WebviewActivity.mListUrl.size(); i++) {
-                        if (str.equalsIgnoreCase((String) ((HashMap) WebviewActivity.mListUrl.get(i)).get(BoxRequestsMetadata.UpdateItemMetadata.BoxMetadataUpdateTask.VALUE))) {
+                    for (int i = 0; i < mListUrl.size(); i++) {
+                        if (str.equalsIgnoreCase((String) ((HashMap) mListUrl.get(i)).get(BoxRequestsMetadata.UpdateItemMetadata.BoxMetadataUpdateTask.VALUE))) {
                             z = true;
                         }
                     }
                 }
-                if (!z || WebviewActivity.mIsFistLoad) {
+                if (!z || mIsFistLoad) {
                     HashMap hashMap2 = new HashMap();
-                    WebviewActivity.access$1308(WebviewActivity.this);
+                    access$1308(WebviewActivity.this);
                     WebviewActivity webviewActivity3 = WebviewActivity.this;
                     SharedPreferences.Editor unused8 = webviewActivity3.stateEditor = webviewActivity3.statePre.edit();
-                    WebviewActivity.this.stateEditor.putString(String.valueOf(WebviewActivity.this.countUrl), str);
-                    EPLog.i("Save countUrl " + WebviewActivity.this.countUrl + " : ", str);
-                    WebviewActivity.this.stateEditor.commit();
-                    hashMap2.put("key", String.valueOf(WebviewActivity.this.countUrl));
+                    stateEditor.putString(String.valueOf(countUrl), str);
+                    EPLog.i("Save countUrl " + countUrl + " : ", str);
+                    stateEditor.commit();
+                    hashMap2.put("key", String.valueOf(countUrl));
                     hashMap2.put(BoxRequestsMetadata.UpdateItemMetadata.BoxMetadataUpdateTask.VALUE, str);
-                    WebviewActivity.mListUrl.add(hashMap2);
-                    WebviewActivity.mIsFistLoad = false;
-                    for (int i2 = 0; i2 < WebviewActivity.mListUrl.size(); i2++) {
-                        EPLog.i(((String) ((HashMap) WebviewActivity.mListUrl.get(i2)).get("key")) + " : ", (String) ((HashMap) WebviewActivity.mListUrl.get(i2)).get(BoxRequestsMetadata.UpdateItemMetadata.BoxMetadataUpdateTask.VALUE));
+                    mListUrl.add(hashMap2);
+                    mIsFistLoad = false;
+                    for (int i2 = 0; i2 < mListUrl.size(); i2++) {
+                        EPLog.i(((String) ((HashMap) mListUrl.get(i2)).get("key")) + " : ", (String) ((HashMap) mListUrl.get(i2)).get(BoxRequestsMetadata.UpdateItemMetadata.BoxMetadataUpdateTask.VALUE));
                     }
                 } else {
-                    WebviewActivity.mIsFistLoad = false;
+                    mIsFistLoad = false;
                     EPLog.i("Link: " + str, " already exist");
                 }
                 if (!str.startsWith("file://")) {
@@ -193,29 +196,29 @@ public class WebviewActivity extends ActivityIACommon implements CommonDefine, V
                     SharedPreferences unused9 = webviewActivity4.statePre = webviewActivity4.getSharedPreferences(CommonDefine.SAVE_URL, 0);
                     WebviewActivity webviewActivity5 = WebviewActivity.this;
                     SharedPreferences.Editor unused10 = webviewActivity5.stateEditor = webviewActivity5.statePre.edit();
-                    WebviewActivity.this.stateEditor.putString(CommonDefine.SAVE_URL, str);
-                    WebviewActivity.this.stateEditor.commit();
+                    stateEditor.putString(CommonDefine.SAVE_URL, str);
+                    stateEditor.commit();
                 }
-                WebviewActivity.mStrictMode.restoreStatus();
+                mStrictMode.restoreStatus();
             }
-            if (WebviewActivity.this.checkSharepage && !WebviewActivity.this.captureStart) {
-                WebviewActivity.this.previewWeb();
+            if (checkSharepage && !captureStart) {
+                previewWeb();
             }
         }
 
         public void onReceivedError(WebView webView, int i, String str, String str2) {
             WebviewActivity webviewActivity = WebviewActivity.this;
-            webviewActivity.mErrorDialog = webviewActivity.createDialog(str);
+            mErrorDialog = createDialog(str);
             try {
-                WebviewActivity.mErrorDialog.show();
+                mErrorDialog.show();
             } catch (WindowManager.BadTokenException e) {
                 e.printStackTrace();
             }
         }
 
         public void onReceivedSslError(WebView webView, final SslErrorHandler sslErrorHandler, SslError sslError) {
-            EPLog.d(WebviewActivity.TAG, "SSL error: " + sslError);
-            if (!WebviewActivity.this.isFinishing()) {
+            EPLog.d(TAG, "SSL error: " + sslError);
+            if (!isFinishing()) {
                 AlertDialog.Builder builder = new AlertDialog.Builder(WebviewActivity.this);
                 builder.setIcon(R.drawable.ic_action_warning);
                 builder.setTitle("SSL error");
@@ -223,13 +226,13 @@ public class WebviewActivity extends ActivityIACommon implements CommonDefine, V
                     public void onClick(DialogInterface dialogInterface, int i) {
                         sslErrorHandler.proceed();
                     }
-                }).setNegativeButton(WebviewActivity.this.getResources().getString(R.string.str_cancel), new DialogInterface.OnClickListener() {
+                }).setNegativeButton(getResources().getString(R.string.str_cancel), new DialogInterface.OnClickListener() {
                     public void onClick(DialogInterface dialogInterface, int i) {
                         sslErrorHandler.cancel();
-                        if (WebviewActivity.this.checkSharepage) {
-                            boolean unused = WebviewActivity.this.checkSharepage = false;
-                            WebviewActivity.this.setResult(0);
-                            WebviewActivity.this.finish();
+                        if (checkSharepage) {
+                            boolean unused = checkSharepage = false;
+                            setResult(0);
+                            finish();
                         }
                     }
                 }).show();
@@ -266,20 +269,20 @@ public class WebviewActivity extends ActivityIACommon implements CommonDefine, V
 
         public void onScaleChanged(WebView webView, float f, float f2) {
             super.onScaleChanged(webView, f, f2);
-            float unused = WebviewActivity.this.onScaleChangedCurrent = f2;
+            float unused = onScaleChangedCurrent = f2;
         }
     };
     private WebChromeClient mWebCromClient = new WebChromeClient() {
         public void onProgressChanged(WebView webView, int i) {
             if (i == 100) {
-                WebviewActivity.mLoadWebLayout.setVisibility(View.GONE);
+                mLoadWebLayout.setVisibility(View.GONE);
             }
         }
 
         public void onReceivedTitle(WebView webView, String str) {
             super.onReceivedTitle(webView, str);
-            if (!WebviewActivity.this.isBuy && !WebviewActivity.this.isFaq && !WebviewActivity.this.isInfo) {
-                WebviewActivity.this.setTitle(str);
+            if (!isBuy && !isFaq && !isInfo) {
+                setTitle(str);
             }
         }
     };
@@ -288,30 +291,30 @@ public class WebviewActivity extends ActivityIACommon implements CommonDefine, V
         public void handleMessage(Message message) {
             switch (message.what) {
                 case 1:
-                    Toast.makeText(WebviewActivity.this.getBaseContext(), WebviewActivity.this.getString(R.string.str_err_msg_out_of_memory_title), 1).show();
+                    Toast.makeText(getBaseContext(), getString(R.string.str_err_msg_out_of_memory_title), 1).show();
                     return;
                 case 2:
                     try {
-                        Utils.makeMessageBox(WebviewActivity.this, WebviewActivity.this.getString(R.string.str_err_msg_out_of_memory_title), WebviewActivity.this.getString(R.string.str_ok)).show();
+                        Utils.makeMessageBox(this, getString(R.string.str_err_msg_out_of_memory_title), getString(R.string.str_ok)).show();
                         return;
                     } catch (Exception e) {
                         e.printStackTrace();
                         return;
                     }
                 case 3:
-                    if (!WebviewActivity.mPreviewWebInterrupted) {
-                        float access$2000 = WebviewActivity.this.getScaleValue();
-                        if (WebviewActivity.mWebview.getProgress() < 100) {
-                            WebviewActivity.myHandler.sendEmptyMessageDelayed(3, 2000);
+                    if (!mPreviewWebInterrupted) {
+                        float access$2000 = getScaleValue();
+                        if (mWebview.getProgress() < 100) {
+                            myHandler.sendEmptyMessageDelayed(3, 2000);
                             return;
-                        } else if (WebviewActivity.mLastHeight == 0 || WebviewActivity.mLastHeight < ((((float) WebviewActivity.mWebview.getContentHeight()) * access$2000))) {
+                        } else if (mLastHeight == 0 || mLastHeight < ((((float) mWebview.getContentHeight()) * access$2000))) {
                             WebviewActivity webviewActivity = WebviewActivity.this;
-                            int unused = webviewActivity.mLastHeight = (((float) webviewActivity.mWebview.getContentHeight()) * access$2000);
-                            WebviewActivity.myHandler.sendEmptyMessageDelayed(3, 5000);
-                            EPLog.d(WebviewActivity.TAG, "Waiting not change mLastHeight = " + WebviewActivity.mLastHeight);
+                            int unused = mLastHeight = (((float) mWebview.getContentHeight()) * access$2000);
+                            myHandler.sendEmptyMessageDelayed(3, 5000);
+                            EPLog.d(TAG, "Waiting not change mLastHeight = " + mLastHeight);
                             return;
                         } else {
-                            WebviewActivity.this.startPreviewWebThread();
+                            startPreviewWebThread();
                             return;
                         }
                     } else {
@@ -334,8 +337,8 @@ public class WebviewActivity extends ActivityIACommon implements CommonDefine, V
     }
 
     static /* synthetic */ int access$1308(WebviewActivity webviewActivity) {
-        int i = webviewActivity.countUrl;
-        webviewActivity.countUrl = i + 1;
+        int i = countUrl;
+        countUrl = i + 1;
         return i;
     }
 
@@ -357,9 +360,9 @@ public class WebviewActivity extends ActivityIACommon implements CommonDefine, V
         teInurl.setOnKeyListener(this);
         teInurl.setOnTouchListener(new View.OnTouchListener() {
             public boolean onTouch(View view, MotionEvent motionEvent) {
-                WebviewActivity.this.setClearButtonAppearance(0);
-                boolean unused = WebviewActivity.mCanRefresh = false;
-                boolean unused2 = WebviewActivity.mCanClear = true;
+                setClearButtonAppearance(0);
+                boolean unused = mCanRefresh = false;
+                boolean unused2 = mCanClear = true;
                 return false;
             }
         });
@@ -391,8 +394,8 @@ public class WebviewActivity extends ActivityIACommon implements CommonDefine, V
         mWebview.setWebChromeClient(mWebCromClient);
         mWebview.setOnTouchListener(new View.OnTouchListener() {
             public boolean onTouch(View view, MotionEvent motionEvent) {
-                WebviewActivity.this.teInurl.clearFocus();
-                WebviewActivity.mWebview.requestFocus();
+                teInurl.clearFocus();
+                mWebview.requestFocus();
                 return false;
             }
         });
@@ -637,7 +640,7 @@ public class WebviewActivity extends ActivityIACommon implements CommonDefine, V
         L_0x001a:
             throw r2
         */
-        throw new UnsupportedOperationException("Method not decompiled: epson.print.WebviewActivity.saveJPG(android.graphics.Bitmap, java.lang.String):void");
+        throw new UnsupportedOperationException("Method not decompiled: epson.print.saveJPG(android.graphics.Bitmap, java.lang.String):void");
     }
 
     public void showLoadingDialog() {
@@ -674,18 +677,18 @@ public class WebviewActivity extends ActivityIACommon implements CommonDefine, V
             View inflate = getLayoutInflater().inflate(mLayoutId, (ViewGroup) null);
             ((Button) inflate.findViewById(R.id.close_btn)).setOnClickListener(new View.OnClickListener() {
                 public void onClick(View view) {
-                    if (WebviewActivity.this.checkSharepage) {
-                        WebviewActivity.mWebview.stopLoading();
-                        WebviewActivity.this.finish();
+                    if (checkSharepage) {
+                        mWebview.stopLoading();
+                        finish();
                     }
-                    WebviewActivity.this.stopDoBackGroundThread();
+                    stopDoBackGroundThread();
                 }
             });
             setContentView(inflate);
         }
 
         public void onBackPressed() {
-            WebviewActivity.this.stopDoBackGroundThread();
+            stopDoBackGroundThread();
         }
     }
 
@@ -797,7 +800,7 @@ public class WebviewActivity extends ActivityIACommon implements CommonDefine, V
             bitmap.setDensity(i);
             mBitmap = bitmap;
             mExRate = d;
-            EPLog.i(WebviewActivity.TAG, "expand => " + d);
+            EPLog.i(TAG, "expand => " + d);
             return true;
         }
 
@@ -814,27 +817,27 @@ public class WebviewActivity extends ActivityIACommon implements CommonDefine, V
                 if (interuptChecker.check()) {
                     return false;
                 }
-                String tempViewDir = ExternalFileUtils.getInstance(WebviewActivity.this).getTempViewDir();
+                String tempViewDir = ExternalFileUtils.getInstance(this).getTempViewDir();
                 String path = new File(tempViewDir, "multi_cut_" + i + ".jpg").getPath();
                 canvas.drawRGB(255, 255, 255);
                 synchronized (obj) {
-                    WebviewActivity.this.runOnUiThread(new Runnable() {
+                    runOnUiThread(new Runnable() {
                         public void run() {
                             synchronized (obj) {
                                 webView.draw(canvas);
                                 obj.notifyAll();
-                                EPLog.m316v(WebviewActivity.TAG, "webView.draw() finish");
+                                EPLog.v(TAG, "webView.draw() finish");
                             }
                         }
                     });
                     try {
-                        EPLog.m316v(WebviewActivity.TAG, "webView.draw() wait page = " + i);
+                        EPLog.v(TAG, "webView.draw() wait page = " + i);
                         obj.wait();
                     } catch (InterruptedException e) {
                         e.printStackTrace();
                     }
                 }
-                WebviewActivity.saveJPG(mBitmap, path);
+                saveJPG(mBitmap, path);
                 arrayList.add(path);
                 height -= width;
                 canvas.translate(0.0f, -((float) width));
@@ -910,32 +913,32 @@ public class WebviewActivity extends ActivityIACommon implements CommonDefine, V
         }
 
         public void run() {
-            if (!WebviewActivity.mPreviewWebInterrupted) {
-                ExternalFileUtils.getInstance(WebviewActivity.this).initTempViewDir();
+            if (!mPreviewWebInterrupted) {
+                ExternalFileUtils.getInstance(this).initTempViewDir();
                 mImageFileCreator = new ImageFileCreator();
                 mImageFileCreator.setPicture(mPicture);
                 if (!mImageFileCreator.prepareBitmap()) {
-                    ExternalFileUtils.getInstance(WebviewActivity.this).initTempViewDir();
-                    WebviewActivity.this.cancelShowingDialog();
-                    WebviewActivity.myHandler.sendEmptyMessage(1);
-                    WebviewActivity.this.finish();
+                    ExternalFileUtils.getInstance(this).initTempViewDir();
+                    cancelShowingDialog();
+                    myHandler.sendEmptyMessage(1);
+                    finish();
                 } else if (isInterrupted()) {
                     freeLargeMem();
-                    ExternalFileUtils.getInstance(WebviewActivity.this).initTempViewDir();
-                    WebviewActivity.this.cancelShowingDialog();
+                    ExternalFileUtils.getInstance(this).initTempViewDir();
+                    cancelShowingDialog();
                 } else {
                     try {
-                        if (!mImageFileCreator.createImageFile(WebviewActivity.mWebview, WebviewActivity.mAddImageView, this) || isInterrupted()) {
-                            ExternalFileUtils.getInstance(WebviewActivity.this).initTempViewDir();
-                            WebviewActivity.this.cancelShowingDialog();
+                        if (!mImageFileCreator.createImageFile(mWebview, mAddImageView, this) || isInterrupted()) {
+                            ExternalFileUtils.getInstance(this).initTempViewDir();
+                            cancelShowingDialog();
                             return;
                         }
-                        WebviewActivity.this.startPrintActivity();
+                        startPrintActivity();
                     } catch (IOException e) {
                         e.printStackTrace();
-                        ExternalFileUtils.getInstance(WebviewActivity.this).initTempViewDir();
-                        WebviewActivity.this.cancelShowingDialog();
-                        WebviewActivity.myHandler.sendEmptyMessage(2);
+                        ExternalFileUtils.getInstance(this).initTempViewDir();
+                        cancelShowingDialog();
+                        myHandler.sendEmptyMessage(2);
                     } finally {
                         freeLargeMem();
                     }
@@ -965,10 +968,10 @@ public class WebviewActivity extends ActivityIACommon implements CommonDefine, V
         create.setMessage(str);
         create.setButton(-1, getString(R.string.str_ok), new DialogInterface.OnClickListener() {
             public void onClick(DialogInterface dialogInterface, int i) {
-                if (str.equals(WebviewActivity.this.getString(R.string.str_no_sdcard))) {
-                    WebviewActivity.this.cancelShowingDialog();
-                    if (WebviewActivity.this.checkImage || WebviewActivity.this.checkSharepage) {
-                        WebviewActivity.this.finish();
+                if (str.equals(getString(R.string.str_no_sdcard))) {
+                    cancelShowingDialog();
+                    if (checkImage || checkSharepage) {
+                        finish();
                     }
                 }
             }
@@ -990,43 +993,43 @@ public class WebviewActivity extends ActivityIACommon implements CommonDefine, V
 
                 protected void onPreExecute() {
                     super.onPreExecute();
-                    WebviewActivity.this.showLoadingDialog();
+                    showLoadingDialog();
                 }
 
                 protected Void doInBackground(Void... voidArr) {
-                    Uri parse = Uri.parse(WebviewActivity.this.inURL);
+                    Uri parse = Uri.parse(inURL);
                     if (String.valueOf(BoxFile.TYPE).equals(parse.getScheme())) {
                         imagePath.add(parse.getPath());
                     } else {
                         String lastPathSegment = parse.getLastPathSegment();
-                        String downloadDir = ExternalFileUtils.getInstance(WebviewActivity.this).getDownloadDir();
-                        ExternalFileUtils.getInstance(WebviewActivity.this).initDownloadDir();
+                        String downloadDir = ExternalFileUtils.getInstance(this).getDownloadDir();
+                        ExternalFileUtils.getInstance(this).initDownloadDir();
                         if (isCancelled()) {
                             return null;
                         }
                         epson.print.Util.Utils.getInstance();
-                        epson.print.Util.Utils.mUtils.downloadFile(WebviewActivity.this.inURL, downloadDir, lastPathSegment, WebviewActivity.this);
+                        epson.print.Util.Utils.mUtils.downloadFile(inURL, downloadDir, lastPathSegment, this);
                         imagePath.add(new File(downloadDir, lastPathSegment).getPath());
                     }
                     return null;
                 }
 
                 protected void onPostExecute(Void voidR) {
-                    EPLog.i(WebviewActivity.TAG, "previewImage::onPostExecute() Share image: " + imagePath.toString());
-                    WebviewActivity webviewActivity = WebviewActivity.this;
-                    Intent unused = webviewActivity.mIntent = new Intent(webviewActivity, ActivityViewImageSelect.class);
-                    WebviewActivity.mIntent.putExtra(ActivityViewImageSelect.LIST_ALBUM, imagePath);
-                    WebviewActivity.mIntent.putExtra(CommonDefine.STYPE, true);
-                    WebviewActivity.mIntent.putExtra("print_log", WebviewActivity.this.getPrintLog());
-                    WebviewActivity webviewActivity2 = WebviewActivity.this;
+                    EPLog.i(TAG, "previewImage::onPostExecute() Share image: " + imagePath.toString());
+                    WebviewActivity webviewActivity = this;
+                    Intent unused = mIntent = new Intent(webviewActivity, ActivityViewImageSelect.class);
+                    mIntent.putExtra(ActivityViewImageSelect.LIST_ALBUM, imagePath);
+                    mIntent.putExtra(CommonDefine.STYPE, true);
+                    mIntent.putExtra("print_log", getPrintLog());
+                    WebviewActivity webviewActivity2 = this;
                     webviewActivity2.startActivity(webviewActivity2.mIntent);
-                    WebviewActivity.this.finish();
+                    finish();
                 }
 
                 protected void onCancelled() {
-                    EPLog.i(WebviewActivity.TAG, "Cancel: OK");
-                    if (WebviewActivity.this.checkImage) {
-                        WebviewActivity.this.finish();
+                    EPLog.i(TAG, "Cancel: OK");
+                    if (checkImage) {
+                        finish();
                     }
                 }
             };

+ 2 - 2
app/src/main/java/epson/print/copy/CopyActivity.java

@@ -152,7 +152,7 @@ public class CopyActivity extends ActivityBase implements View.OnClickListener {
     }
 
     public void onResume() {
-        EPLog.m316v(this.TAG, "onResume()");
+        EPLog.v(this.TAG, "onResume()");
         super.onResume();
         this.isKeepSimpleAPConnection = false;
         getPrinterInfo();
@@ -180,7 +180,7 @@ public class CopyActivity extends ActivityBase implements View.OnClickListener {
     }
 
     public void onPause() {
-        EPLog.m316v(this.TAG, "onPause()");
+        EPLog.v(this.TAG, "onPause()");
         super.onPause();
         int i = this.printerLocation;
         if (i == 1 || i == 3) {

+ 2 - 2
app/src/main/java/epson/print/ecclient/HttpApache.java

@@ -19,7 +19,7 @@ public class HttpApache extends HttpAccess {
             DebugDisplay debugDisplay = this.mDisplay;
             debugDisplay.addResText(str + Constants.BREAK_LINE);
         }
-        EPLog.m316v("epson_connect", str);
+        EPLog.v("epson_connect", str);
     }
 
     private void dispHttpCmd(URL url) {
@@ -27,7 +27,7 @@ public class HttpApache extends HttpAccess {
             DebugDisplay debugDisplay = this.mDisplay;
             debugDisplay.addResText("=> " + url.toString() + Constants.BREAK_LINE);
         }
-        EPLog.m316v("epson_connect", url.toString());
+        EPLog.v("epson_connect", url.toString());
     }
 
     public int HttpGet(String str) {

+ 2 - 2
app/src/main/java/epson/print/imgsel/Alt2ViewImageAdapter.java

@@ -76,14 +76,14 @@ public class Alt2ViewImageAdapter extends BaseAdapter implements CommonDefine {
             } else {
                 imageView.setImageBitmap((Bitmap) null);
                 imageView.setBackgroundColor(-3355444);
-                EPLog.m316v("null", "bitmap is null");
+                EPLog.v("null", "bitmap is null");
                 ImageGridFragment imageGridFragment = (ImageGridFragment) this.mFragmentReference.get();
                 if (imageGridFragment != null) {
                     imageGridFragment.changeThumnailPriority(imageItem);
                 }
             }
         } catch (NullPointerException e2) {
-            EPLog.m316v("null pointer Exception", "line 61 <> View Image Adapter");
+            EPLog.v("null pointer Exception", "line 61 <> View Image Adapter");
             e2.printStackTrace();
         }
         ImageView imageView2 = (ImageView) view.findViewById(R.id.checkIcon);

+ 7 - 7
app/src/main/java/epson/print/pdf/AdobePdfContainer.java

@@ -47,17 +47,17 @@ public class AdobePdfContainer {
 
     public AdobePdfContainer(Context context) {
         this.mContext = context;
-        EPLog.m316v(TAG, "adpbeMPSInterface.MPSInit()");
+        EPLog.v(TAG, "adpbeMPSInterface.MPSInit()");
         this.adpbeMPSInterface.MPSInit("com/adobe/mps/ARAESCryptor", "com/adobe/mps/ARSHADigest");
     }
 
     /* access modifiers changed from: protected */
     public void finalize() {
-        EPLog.m316v(TAG, "finalize()");
+        EPLog.v(TAG, "finalize()");
     }
 
     public void LoadDocument(String str, String str2) throws PasswordException, NoPdfException {
-        EPLog.m316v(TAG, "call LoadDocument()");
+        EPLog.v(TAG, "call LoadDocument()");
         if (str2 == null || str2.length() == 0) {
             this.pageCount = this.adpbeMPSInterface.PDFDocInit(str);
         } else {
@@ -98,7 +98,7 @@ public class AdobePdfContainer {
     }
 
     public Bitmap getPageBitmap(int i, int i2, int i3, int i4) throws Exception {
-        EPLog.m316v(TAG, "getPageBitmap() Start");
+        EPLog.v(TAG, "getPageBitmap() Start");
         if (CountPages() >= i) {
             Bitmap bitmap = this.f385bm;
             if (bitmap != null) {
@@ -124,7 +124,7 @@ public class AdobePdfContainer {
             } else {
                 EPLog.m307e(TAG, "Failed ByteBuffer.allocateDirect()");
             }
-            EPLog.m316v(TAG, "getPageBitmap() End");
+            EPLog.v(TAG, "getPageBitmap() End");
             return this.f385bm;
         }
         throw new ParameterException();
@@ -132,7 +132,7 @@ public class AdobePdfContainer {
 
     public String getPageBitmapFile(int i, int i2, int i3, boolean z) throws Exception {
         String str;
-        EPLog.m316v(TAG, "getPageBitmapFile() Start");
+        EPLog.v(TAG, "getPageBitmapFile() Start");
         if (CountPages() >= i) {
             String path = new File(ExternalFileUtils.getInstance(this.mContext).getPrintDir(), "tmpPDF.jpg").getPath();
             if (this.adpbeMPSInterface.PDFPagetoImage(i, path, i2, i3, 0) != 0) {
@@ -144,7 +144,7 @@ public class AdobePdfContainer {
             } else {
                 str = path;
             }
-            EPLog.m316v(TAG, "getPageBitmapFile() End");
+            EPLog.v(TAG, "getPageBitmapFile() End");
             return str;
         }
         throw new ParameterException();

+ 2 - 2
app/src/main/java/epson/print/rpcopy/CopyActivity.java

@@ -148,7 +148,7 @@ public class CopyActivity extends ActivityBase implements View.OnClickListener {
     }
 
     public void onResume() {
-        EPLog.m316v(this.TAG, "onResume()");
+        EPLog.v(this.TAG, "onResume()");
         super.onResume();
         this.isKeepSimpleAPConnection = false;
         getPrinterInfo();
@@ -176,7 +176,7 @@ public class CopyActivity extends ActivityBase implements View.OnClickListener {
     }
 
     public void onPause() {
-        EPLog.m316v(this.TAG, "onPause()");
+        EPLog.v(this.TAG, "onPause()");
         super.onPause();
         int i = this.printerLocation;
         if (i == 1 || i == 3) {

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

@@ -84,7 +84,7 @@ public class PaperSourceSettingScr extends ActivityIACommon {
     };
     private ServiceConnection mEpsonConnection = new ServiceConnection() {
         public void onServiceDisconnected(ComponentName componentName) {
-            EPLog.m316v("SettingScr", "onServiceDisconnected");
+            EPLog.v("SettingScr", "onServiceDisconnected");
             try {
                 PaperSourceSettingScr.this.mEpsonService.unregisterCallback(PaperSourceSettingScr.this.mCallback);
             } catch (RemoteException e) {
@@ -95,7 +95,7 @@ public class PaperSourceSettingScr extends ActivityIACommon {
 
         public void onServiceConnected(ComponentName componentName, IBinder iBinder) {
             IEpsonService unused = PaperSourceSettingScr.this.mEpsonService = IEpsonService.Stub.asInterface(iBinder);
-            EPLog.m316v("SettingScr", "onServiceConnected");
+            EPLog.v("SettingScr", "onServiceConnected");
             if (PaperSourceSettingScr.this.mEpsonService != null) {
                 try {
                     PaperSourceSettingScr.this.mEpsonService.registerCallback(PaperSourceSettingScr.this.mCallback);

+ 5 - 5
app/src/main/java/epson/print/screen/SettingScr.java

@@ -179,7 +179,7 @@ public class SettingScr extends ActivityIACommon implements View.OnClickListener
     public Context mContext = null;
     private ServiceConnection mEpsonConnection = new ServiceConnection() {
         public void onServiceDisconnected(ComponentName componentName) {
-            EPLog.m316v("SettingScr", "onServiceDisconnected");
+            EPLog.v("SettingScr", "onServiceDisconnected");
             try {
                 SettingScr.this.mEpsonService.unregisterCallback(SettingScr.this.mCallback);
             } catch (RemoteException e) {
@@ -190,7 +190,7 @@ public class SettingScr extends ActivityIACommon implements View.OnClickListener
 
         public void onServiceConnected(ComponentName componentName, IBinder iBinder) {
             IEpsonService unused = SettingScr.this.mEpsonService = IEpsonService.Stub.asInterface(iBinder);
-            EPLog.m316v("SettingScr", "onServiceConnected");
+            EPLog.v("SettingScr", "onServiceConnected");
             if (SettingScr.this.mEpsonService != null) {
                 try {
                     SettingScr.this.mEpsonService.registerCallback(SettingScr.this.mCallback);
@@ -928,7 +928,7 @@ public class SettingScr extends ActivityIACommon implements View.OnClickListener
                 r4 = r4[r15]
                 r3.append(r4)
                 java.lang.String r3 = r3.toString()
-                epson.print.Util.EPLog.m316v(r0, r3)
+                epson.print.Util.EPLog.v(r0, r3)
                 epson.print.screen.SettingScr r0 = epson.print.screen.SettingScr.this
                 int r0 = r0.layout
                 epson.print.screen.SettingScr r3 = epson.print.screen.SettingScr.this
@@ -2296,14 +2296,14 @@ public class SettingScr extends ActivityIACommon implements View.OnClickListener
     }
 
     private void bindEpsonService() {
-        EPLog.m316v("SettingScr", "bindEpsonService");
+        EPLog.v("SettingScr", "bindEpsonService");
         if (this.mEpsonService == null) {
             bindService(new Intent(this, EpsonService.class), this.mEpsonConnection, 1);
         }
     }
 
     private void unbindEpsonService() {
-        EPLog.m316v("SettingScr", "unbindEpsonService");
+        EPLog.v("SettingScr", "unbindEpsonService");
         IEpsonService iEpsonService = this.mEpsonService;
         if (iEpsonService != null) {
             try {

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

@@ -360,7 +360,7 @@ public class EpsonService extends Service implements ApfEpImageAdapter.ProgressC
 
         public int confirmCancel(boolean z) {
             EPLog.m307e("LAM DAI HIEP", "confirmCancel() call");
-            EPLog.m316v("cancel ", "iscancel " + z);
+            EPLog.v("cancel ", "iscancel " + z);
             if (!z) {
                 return 0;
             }