liuyuqi-dellpc 3 years ago
parent
commit
9d941ce2e4

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

@@ -28,7 +28,7 @@ public class GuideWebviewFragment extends Fragment {
         GuideWebviewFragment guideWebviewFragment = new GuideWebviewFragment();
         Bundle bundle = new Bundle();
         bundle.putString(ARG_PARAM1, str);
-        guideWebviewFragment.setArguments(bundle);
+        setArguments(bundle);
         return guideWebviewFragment;
     }
 
@@ -59,8 +59,8 @@ public class GuideWebviewFragment extends Fragment {
         mWebViewFrame.setLayoutParams(marginLayoutParams2);
         inflate.findViewById(R.id.closeImage).setOnClickListener(new View.OnClickListener() {
             public void onClick(View view) {
-                if (GuideWebviewFragment.mClickListerner != null) {
-                    GuideWebviewFragment.mClickListerner.onClickClose();
+                if (mClickListerner != null) {
+                    mClickListerner.onClickClose();
                 }
             }
         });

+ 3 - 1
app/src/main/java/com/epson/mobilephone/common/guide/MyViewPager.java

@@ -1,10 +1,12 @@
 package com.epson.mobilephone.common.guide;
 
 import android.content.Context;
-import android.support.p000v4.view.ViewPager;
+
 import android.util.AttributeSet;
 import android.view.View;
 
+import androidx.viewpager.widget.ViewPager;
+
 public class MyViewPager extends ViewPager {
     public MyViewPager(Context context) {
         super(context);

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

@@ -18,11 +18,11 @@ public class Utils {
             return WEBVIEW_300DP_SIZE;
         }
         if (pxtodp2 < pxtodp) {
-            int i = ((pxtodp2) * 0.7d);
+            int i = (int) ((pxtodp2) * 0.7d);
             int i2 = WEBVIEW_500DP_SIZE;
             return i < LAYOUT_MEARGIN + i2 ? i : i2;
         }
-        int i3 = ((pxtodp) * 0.7d);
+        int i3 = (int) ((pxtodp) * 0.7d);
         int i4 = WEBVIEW_500DP_SIZE;
         return i3 < LAYOUT_MEARGIN + i4 ? i3 : i4;
     }

+ 6 - 2
app/src/main/java/com/epson/mobilephone/common/license/DefaultLicenseInfo.java

@@ -2,14 +2,18 @@ package com.epson.mobilephone.common.license;
 
 import android.content.Context;
 
+import androidx.annotation.NonNull;
+
+import epson.print.R;
+
 
 public abstract class DefaultLicenseInfo implements LicenseInfo {
     private String getDefaultSoftwareLicense(@NonNull Context context) {
-        return C1073Util.getStringFromRawResource(context, R.raw.eula);
+        return Util.getStringFromRawResource(context, R.raw.eula);
     }
 
     private String getDefaultPrivacyStatement(@NonNull Context context) {
-        return C1073Util.getStringFromRawResource(context, R.raw.privacy);
+        return Util.getStringFromRawResource(context, R.raw.privacy);
     }
 
     public String getDocumentString(@NonNull Context context, int i) {

+ 6 - 2
app/src/main/java/com/epson/mobilephone/common/license/DefaultUserSurveyInfo.java

@@ -2,10 +2,14 @@ package com.epson.mobilephone.common.license;
 
 import android.content.Context;
 
+import androidx.annotation.NonNull;
+
+import epson.print.R;
+
 
 public abstract class DefaultUserSurveyInfo implements UserSurveyInfo {
     public String getUserSurveyInvitationText(@NonNull Context context) {
-        return C1073Util.getStringFromRawResource(context, R.raw.user_survey);
+        return Util.getStringFromRawResource(context, R.raw.user_survey);
     }
 
     @NonNull
@@ -13,6 +17,6 @@ public abstract class DefaultUserSurveyInfo implements UserSurveyInfo {
         if (i != 1) {
             return context.getString(R.string.Cancel);
         }
-        return context.getString(R.string.f148OK);
+        return context.getString(R.string.OK);
     }
 }

+ 2 - 0
app/src/main/java/com/epson/mobilephone/common/license/LicenseInfo.java

@@ -2,6 +2,8 @@ package com.epson.mobilephone.common.license;
 
 import android.content.Context;
 
+import androidx.annotation.NonNull;
+
 import java.io.Serializable;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;

+ 5 - 4
app/src/main/java/com/epson/mobilephone/common/license/LicenseTopActivity.java

@@ -37,22 +37,22 @@ public class LicenseTopActivity extends AppCompatActivity implements SimpleMessa
         setContentView(R.layout.activity_license_top);
         ((ViewGroup) findViewById(R.id.licenseViewGroup)).setOnClickListener(new View.OnClickListener() {
             public void onClick(View view) {
-                LicenseTopActivity.this.startDocumentDisplayActivity(1);
+                startDocumentDisplayActivity(1);
             }
         });
         ((ViewGroup) findViewById(R.id.privacyStatementViewGroup)).setOnClickListener(new View.OnClickListener() {
             public void onClick(View view) {
-                LicenseTopActivity.this.startDocumentDisplayActivity(2);
+                startDocumentDisplayActivity(2);
             }
         });
         ((Button) findViewById(R.id.agreeButton)).setOnClickListener(new View.OnClickListener() {
             public void onClick(View view) {
-                LicenseTopActivity.this.onAgree();
+                onAgree();
             }
         });
         ((Button) findViewById(R.id.disagreeButton)).setOnClickListener(new View.OnClickListener() {
             public void onClick(View view) {
-                LicenseTopActivity.this.onDisagree();
+                onDisagree();
             }
         });
         if (!initField(getIntent())) {
@@ -156,6 +156,7 @@ public class LicenseTopActivity extends AppCompatActivity implements SimpleMessa
     }
 
     protected void onActivityResult(int i, int i2, Intent intent) {
+        super.onActivityResult(i, i2, intent);
         if (i == 2) {
             setResult(-1);
             finish();

+ 5 - 1
app/src/main/java/com/epson/mobilephone/common/license/SimpleMessageDialogFragment.java

@@ -6,6 +6,10 @@ import android.app.Dialog;
 import android.content.DialogInterface;
 import android.os.Bundle;
 
+import androidx.annotation.NonNull;
+import androidx.fragment.app.DialogFragment;
+
+import epson.print.R;
 
 
 public class SimpleMessageDialogFragment extends DialogFragment {
@@ -39,7 +43,7 @@ public class SimpleMessageDialogFragment extends DialogFragment {
     @NonNull
     public Dialog onCreateDialog(Bundle bundle) {
         super.onCreateDialog(bundle);
-        AlertDialog create = new AlertDialog.Builder(getActivity()).setMessage(mMessageString).setPositiveButton(R.string.f148OK, new DialogInterface.OnClickListener() {
+        AlertDialog create = new AlertDialog.Builder(getActivity()).setMessage(mMessageString).setPositiveButton(R.string.OK, new DialogInterface.OnClickListener() {
             public void onClick(DialogInterface dialogInterface, int i) {
                 SimpleMessageDialogFragment.this.onOkClicked();
             }

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

@@ -3,6 +3,9 @@ package com.epson.mobilephone.common.license;
 import android.content.Context;
 
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 import java.io.Serializable;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;

+ 4 - 8
app/src/main/java/com/epson/mobilephone/common/license/UserSurveyInvitationActivity.java

@@ -3,9 +3,6 @@ package com.epson.mobilephone.common.license;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-
-
-import android.support.p003v7.widget.Toolbar;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
@@ -13,10 +10,10 @@ import android.widget.TextView;
 
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.AppCompatActivity;
-
-import com.epson.mobilephone.common.license.SimpleMessageDialogFragment;
+import androidx.appcompat.widget.Toolbar;
 
 import epson.common.Constants;
+import epson.print.R;
 
 public class UserSurveyInvitationActivity extends AppCompatActivity implements SimpleMessageDialogFragment.DialogCallback {
     private static final int DIALOG_ID_CHANGE_DIALOG = 1;
@@ -28,8 +25,7 @@ public class UserSurveyInvitationActivity extends AppCompatActivity implements S
     private UserSurveyInfo mUserSurveyInfo;
 
     public void onButtonClicked(int i) {
-        if (i == 1) {
-        }
+
     }
 
     protected void onCreate(Bundle bundle) {
@@ -67,7 +63,7 @@ public class UserSurveyInvitationActivity extends AppCompatActivity implements S
                 str = userSurveyInfo2.getUserSurveyInvitationText(this);
             }
             if (str == null) {
-                str = C1073Util.getStringFromRawResource(getApplicationContext(), R.raw.user_survey);
+                str = Util.getStringFromRawResource(getApplicationContext(), R.raw.user_survey);
             }
             textView.setText(str);
             changeButtonText(button2, 1, mUserSurveyInfo, this);

+ 3 - 4
app/src/main/java/com/epson/mobilephone/common/license/C1073Util.java → app/src/main/java/com/epson/mobilephone/common/license/Util.java

@@ -1,15 +1,14 @@
 package com.epson.mobilephone.common.license;
 
 import android.content.Context;
-
-import android.support.annotation.RawRes;
-
+import androidx.annotation.NonNull;
+import androidx.annotation.RawRes;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 
 /* renamed from: com.epson.mobilephone.common.license.Util */
-public class C1073Util {
+public class Util {
     public static String getStringFromRawResource(@NonNull Context context, @RawRes int i) {
         InputStream openRawResource = context.getResources().openRawResource(i);
         try {

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

@@ -6,7 +6,7 @@ import android.hardware.usb.UsbEndpoint;
 import android.hardware.usb.UsbInterface;
 import android.hardware.usb.UsbManager;
 import android.os.Build;
-
+import epson.print.Util.EPLog;
 import com.evernote.edam.limits.Constants;
 
 public class UsbPrinter {

+ 0 - 1
app/src/main/java/epson/print/Util/EPLog.java

@@ -1,7 +1,6 @@
 package epson.print.Util;
 
 import android.util.Log;
-
 import epson.print.CommonDefine;
 
 public final class EPLog {

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

@@ -5,7 +5,7 @@ import android.os.Bundle;
 import android.support.p000v4.app.Fragment;
 import android.support.p000v4.app.FragmentManager;
 import android.support.p000v4.app.FragmentStatePagerAdapter;
-import android.support.p000v4.view.ViewPager;
+
 import android.util.DisplayMetrics;
 import android.view.Menu;
 import android.view.MenuItem;