update jama

mobile/src/main/java/cn/garymb/ygomobile/ui/home/HomeActivity.java

 package cn.garymb.ygomobile.ui.home;
 
+import android.content.Context;
 import android.content.Intent;
 import android.graphics.Color;
 import android.net.Uri;
@@ -22,6 +23,7 @@ import android.view.inputmethod.EditorInfo;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.ListView;
+import android.widget.ProgressBar;
 import android.widget.Toast;
 
 import com.base.bj.trpayjar.utils.TrPay;
@@ -61,7 +63,7 @@ import cn.garymb.ygomobile.ui.plus.ServiceDuelAssistant;
 import cn.garymb.ygomobile.ui.preference.SettingsActivity;
 import cn.garymb.ygomobile.utils.AlipayPayUtils;
 
-abstract class HomeActivity extends BaseActivity implements NavigationView.OnNavigationItemSelectedListener {
+public abstract class HomeActivity extends BaseActivity implements NavigationView.OnNavigationItemSelectedListener {
     protected SwipeMenuRecyclerView mServerList;
     long exitLasttime = 0;
     private ServerListAdapter mServerListAdapter;
@@ -110,7 +112,7 @@ abstract class HomeActivity extends BaseActivity implements NavigationView.OnNav
         //trpay
         TrPay.getInstance(HomeActivity.this).initPaySdk("e1014da420ea4405898c01273d6731b6", "YGOMobile");
         //autoupadte checking
-        checkPgyerUpdateSilent();
+        checkPgyerUpdateSilent(getContext());
         //ServiceDuelAssistant
         startService(new Intent(this, ServiceDuelAssistant.class));
         StartMycard();
@@ -393,7 +395,7 @@ abstract class HomeActivity extends BaseActivity implements NavigationView.OnNav
         mMenuIds.put(mMenuIds.size(), menuId);
     }
 
-    public static void checkPgyerUpdateSilent() {
+    public static void checkPgyerUpdateSilent(Context context) {
         //蒲公英自动检查更新
         new PgyUpdateManager.Builder()
                 .setForced(true)
@@ -402,35 +404,31 @@ abstract class HomeActivity extends BaseActivity implements NavigationView.OnNav
                 .setUpdateManagerListener(new UpdateManagerListener() {
                     @Override
                     public void onNoUpdateAvailable() {
-                        Toast.makeText(getContext(), R.string.Already_Lastest, Toast.LENGTH_SHORT).show();
+                        Toast.makeText(context, R.string.Already_Lastest, Toast.LENGTH_SHORT).show();
                     }
                     @Override
                     public void onUpdateAvailable(AppBean appBean) {
                         final String versionName,updateMessage;
                         versionName = appBean.getVersionName();
                         updateMessage = appBean.getReleaseNote();
-                        DialogPlus builder = new DialogPlus(getContext());
+                        DialogPlus builder = new DialogPlus(context);
                         builder.setTitle("发现新版本"+versionName);
                         builder.setMessage(updateMessage);
                         builder.setRightButtonText("下载");
                         builder.setRightButtonListener((dlg, i) -> {
+                            builder.showProgressBar2();
+                            builder.hideButton();
                             PgyUpdateManager.downLoadApk(appBean.getDownloadURL());
-                            dlg.dismiss();
                         });
+
                         builder.show();
                     }
 
                     @Override
                     public void checkUpdateFailed(Exception e) {
-                        //更新检测失败回调
-                        //更新拒绝（应用被下架，过期，不在安装有效期，下载次数用尽）以及无网络情况会调用此接口
-                        Log.e("pgyer", "check update failed ", e);
+                        Toast.makeText(context, R.string.Already_Lastest, Toast.LENGTH_SHORT).show();
                     }
                 })
-                //注意 ：
-                //下载方法调用 PgyUpdateManager.downLoadApk(appBean.getDownloadURL()); 此回调才有效
-                //此方法是方便用户自己实现下载进度和状态的 UI 提供的回调
-                //想要使用蒲公英的默认下载进度的UI则不设置此方法
                 .setDownloadFileListener(new DownloadFileListener() {
                     @Override
                     public void downloadFailed() {
@@ -440,13 +438,12 @@ abstract class HomeActivity extends BaseActivity implements NavigationView.OnNav
 
                     @Override
                     public void downloadSuccessful(Uri uri) {
-                        Log.e("pgyer", "download apk failed");
-                        // 使用蒲公英提供的安装方法提示用户 安装apk
                         PgyUpdateManager.installApk(uri);
                     }
 
                     @Override
                     public void onProgressUpdate(Integer... integers) {
+                        //DialogPlus.mProgressBar2.setProgress(integers);
                         Log.e("pgyer", "update download apk progress" + integers);
                     }})
                 .register();

mobile/src/main/java/cn/garymb/ygomobile/ui/plus/DialogPlus.java

@@ -38,6 +38,7 @@ public class DialogPlus extends Dialog {
     private String mUrl, mHtml;
     private View mCancelLayout, mButtonLayout, mTitleLayout;
     private View mProgressBar;
+    public View mProgressBar2;
     private WebViewPlus mWebView;
     private final GestureDetector mGestureDetector;
     private GestureDetector.OnGestureListener mOnGestureListener;
@@ -64,6 +65,7 @@ public class DialogPlus extends Dialog {
         mButtonLayout = $(R.id.layout_button);
         mTitleLayout = $(R.id.layout_title);
         mProgressBar = $(R.id.pb1);
+        mProgressBar2 = $(R.id.pb2);
         setOnCloseLinster((dlg) -> {
             dlg.dismiss();
         });
@@ -155,6 +157,7 @@ public class DialogPlus extends Dialog {
         dialog.setOnCancelListener(cancelListener);
         dialog.hideButton();
         dialog.showProgressBar();
+        dialog.showProgressBar2();
 //        dialog.getWindow().setType(TYPE_KEYGUARD);
         dialog.show();
         return dialog;
@@ -180,6 +183,13 @@ public class DialogPlus extends Dialog {
         return this;
     }
 
+    public DialogPlus showProgressBar2() {
+        if (mProgressBar2 != null) {
+            mProgressBar2.setVisibility(View.VISIBLE);
+        }
+        return this;
+    }
+
     @Override
     public void setTitle(@Nullable CharSequence title) {
         setTitleText(title == null ? null : title.toString());

mobile/src/main/java/cn/garymb/ygomobile/ui/preference/fragments/SettingFragment.java

@@ -178,7 +178,7 @@ public class SettingFragment extends PreferenceFragmentPlus {
                     .show();
         }
         if (PREF_CHECK_UPDATE.equals(preference.getKey())) {
-            HomeActivity.checkPgyerUpdateSilent();
+            HomeActivity.checkPgyerUpdateSilent(getContext());
         }
         if (PREF_PENDULUM_SCALE.equals(key)) {
             CheckBoxPreference checkBoxPreference = (CheckBoxPreference) preference;

mobile/src/main/res/layout/dialog_plus_base.xml

@@ -76,6 +76,18 @@
 
         </LinearLayout>
 
+
+        <ProgressBar
+            android:id="@+id/pb2"
+            style="@style/StyleProgressBarMini"
+            android:layout_width="match_parent"
+            android:layout_gravity="center_horizontal|center_vertical"
+            android:layout_height="50px"
+            android:visibility="gone"
+            android:background="@color/colorAccent"
+            tools:visibility="visible"/>
+
+
         <LinearLayout
             android:id="@+id/layout_button"
             android:layout_width="match_parent"

mobile/src/main/res/values-zh/strings.xml

@@ -221,4 +221,6 @@
     <string name="ClickLinkArrows">点亮箭头</string>
     <string name="Already_Lastest">已经是最新版本</string>
     <string name="about_immersive_mode">开关它来适配非16:9的分辨率屏幕，有的机型需要先在系统设置开启全屏应用</string>
+    <string name="OK">确定</string>
+    <string name="Cancel">取消</string>
 </resources>

mobile/src/main/res/values/strings.xml

@@ -224,4 +224,6 @@
     <string name="ClickLinkArrows">click link arrows</string>
     <string name="Already_Lastest">Already be the Lastest Version</string>
     <string name="about_immersive_mode">switch it to optimize the screen resolution which isnot 16:9</string>
+    <string name="OK">OK</string>
+    <string name="Cancel">Cancel</string>
     </resources>