|
|
@@ -1,6 +1,7 @@
|
|
|
package com.uas.appme.settings.activity;
|
|
|
|
|
|
import android.annotation.TargetApi;
|
|
|
+import android.app.Activity;
|
|
|
import android.app.ActivityManager;
|
|
|
import android.app.ProgressDialog;
|
|
|
import android.content.Context;
|
|
|
@@ -20,6 +21,7 @@ import android.view.MenuItem;
|
|
|
import android.view.View;
|
|
|
import android.view.ViewGroup;
|
|
|
import android.view.WindowManager;
|
|
|
+import android.widget.Button;
|
|
|
import android.widget.ImageView;
|
|
|
import android.widget.LinearLayout;
|
|
|
import android.widget.PopupWindow;
|
|
|
@@ -33,7 +35,7 @@ import com.baidu.autoupdatesdk.AppUpdateInfo;
|
|
|
import com.baidu.autoupdatesdk.AppUpdateInfoForInstall;
|
|
|
import com.baidu.autoupdatesdk.BDAutoUpdateSDK;
|
|
|
import com.baidu.autoupdatesdk.CPCheckUpdateCallback;
|
|
|
-import com.baidu.autoupdatesdk.UICheckUpdateCallback;
|
|
|
+import com.baidu.autoupdatesdk.CPUpdateDownloadCallback;
|
|
|
import com.common.LogUtil;
|
|
|
import com.common.config.BaseConfig;
|
|
|
import com.common.data.JSONUtil;
|
|
|
@@ -41,6 +43,7 @@ import com.common.data.StringUtil;
|
|
|
import com.common.file.FileUtils;
|
|
|
import com.common.preferences.PreferenceUtils;
|
|
|
import com.common.system.DisplayUtil;
|
|
|
+import com.common.system.SystemUtil;
|
|
|
import com.core.api.wxapi.ApiPlatform;
|
|
|
import com.core.api.wxapi.ApiUtils;
|
|
|
import com.core.app.AppConfig;
|
|
|
@@ -53,11 +56,13 @@ import com.core.dao.work.WorkModelDao;
|
|
|
import com.core.model.OAConfig;
|
|
|
import com.core.model.WorkModel;
|
|
|
import com.core.net.http.ViewUtil;
|
|
|
+import com.core.net.utils.NetUtils;
|
|
|
import com.core.utils.CommonUtil;
|
|
|
import com.core.utils.ToastUtil;
|
|
|
import com.core.utils.helper.LoginHelper;
|
|
|
import com.core.utils.sp.UserSp;
|
|
|
import com.core.widget.view.SwitchView;
|
|
|
+import com.hss01248.notifyutil.NotifyUtil;
|
|
|
import com.me.network.app.http.HttpClient;
|
|
|
import com.me.network.app.http.Method;
|
|
|
import com.me.network.app.http.rx.ResultListener;
|
|
|
@@ -78,7 +83,6 @@ import java.io.File;
|
|
|
import java.util.ArrayList;
|
|
|
import java.util.List;
|
|
|
|
|
|
-
|
|
|
/**
|
|
|
* 设置
|
|
|
*/
|
|
|
@@ -415,41 +419,63 @@ public class SettingActivity extends SupportToolBarActivity implements View.OnCl
|
|
|
} else if (v.getId() == R.id.share_rl) {
|
|
|
share();
|
|
|
} else if (v.getId() == R.id.rl_app_update) {
|
|
|
- dialog.setMessage(getString(R.string.set_check_update_wait));
|
|
|
- dialog.show();
|
|
|
- BDAutoUpdateSDK.uiUpdateAction(this, new UICheckUpdateCallback() {
|
|
|
- @Override
|
|
|
- public void onCheckComplete() {
|
|
|
- BDAutoUpdateSDK.cpUpdateCheck(SettingActivity.this,
|
|
|
- new CPCheckUpdateCallback() {
|
|
|
-
|
|
|
- @Override
|
|
|
- public void onCheckUpdateCallback(
|
|
|
- AppUpdateInfo info,
|
|
|
- AppUpdateInfoForInstall infoForInstall) {
|
|
|
- if (infoForInstall != null
|
|
|
- && !TextUtils
|
|
|
- .isEmpty(infoForInstall
|
|
|
- .getInstallPath())) {
|
|
|
- } else if (info != null) {
|
|
|
- } else {
|
|
|
-// ViewUtil.ShowMessageTitle(
|
|
|
-// SettingActivity.this,
|
|
|
-// getString(R.string.set_isnewVersion));
|
|
|
- PopupWindowHelper.showAlart(SettingActivity.this,
|
|
|
- getString(R.string.app_dialog_title), getString(R.string.set_isnewVersion)
|
|
|
- , new PopupWindowHelper.OnSelectListener() {
|
|
|
- @Override
|
|
|
- public void select(boolean selectOk) {
|
|
|
-
|
|
|
- }
|
|
|
- });
|
|
|
- }
|
|
|
- dialog.dismiss();
|
|
|
- }
|
|
|
- });
|
|
|
- }
|
|
|
- });
|
|
|
+ if (!NetUtils.isNetWorkConnected(MyApplication.getInstance())) {
|
|
|
+ ToastUtil.showToast(MyApplication.getInstance(), R.string.networks_out);
|
|
|
+ } else {
|
|
|
+ dialog.setMessage(getString(R.string.set_check_update_wait));
|
|
|
+ dialog.show();
|
|
|
+
|
|
|
+ BDAutoUpdateSDK.cpUpdateCheck(this, new MyCPCheckUpdateCallback());
|
|
|
+// BDAutoUpdateSDK.uiUpdateAction(this, new UICheckUpdateCallback() {
|
|
|
+// @Override
|
|
|
+// public void onNoUpdateFound() {
|
|
|
+// PopupWindowHelper.showAlart(SettingActivity.this,
|
|
|
+// getString(R.string.app_dialog_title), getString(R.string.set_isnewVersion)
|
|
|
+// , new PopupWindowHelper.OnSelectListener() {
|
|
|
+// @Override
|
|
|
+// public void select(boolean selectOk) {
|
|
|
+// dialog.dismiss();
|
|
|
+// }
|
|
|
+// });
|
|
|
+// }
|
|
|
+//
|
|
|
+// @Override
|
|
|
+// public void onCheckComplete() {
|
|
|
+// if (DialogUtils.isDialogShowing(dialog)){
|
|
|
+// dialog.dismiss();
|
|
|
+// }
|
|
|
+// BDAutoUpdateSDK.cpUpdateCheck(SettingActivity.this,
|
|
|
+// new CPCheckUpdateCallback() {
|
|
|
+//
|
|
|
+// @Override
|
|
|
+// public void onCheckUpdateCallback(
|
|
|
+// AppUpdateInfo info,
|
|
|
+// AppUpdateInfoForInstall infoForInstall) {
|
|
|
+// if (infoForInstall != null
|
|
|
+// && !TextUtils
|
|
|
+// .isEmpty(infoForInstall
|
|
|
+// .getInstallPath())) {
|
|
|
+//
|
|
|
+// } else if (info != null) {
|
|
|
+//
|
|
|
+// } else {
|
|
|
+// PopupWindowHelper.showAlart(SettingActivity.this,
|
|
|
+// getString(R.string.app_dialog_title), getString(R.string.set_isnewVersion)
|
|
|
+// , new PopupWindowHelper.OnSelectListener() {
|
|
|
+// @Override
|
|
|
+// public void select(boolean selectOk) {
|
|
|
+//
|
|
|
+// }
|
|
|
+// });
|
|
|
+// }
|
|
|
+//
|
|
|
+// }
|
|
|
+// });
|
|
|
+//
|
|
|
+// }
|
|
|
+// });
|
|
|
+ }
|
|
|
+
|
|
|
} else if (v.getId() == R.id.super_setting_tv) {
|
|
|
startActivityForResult(new Intent(mContext, SignSeniorSettingActivity.class), 0x12);
|
|
|
closePopupWindow();
|
|
|
@@ -703,4 +729,123 @@ public class SettingActivity extends SupportToolBarActivity implements View.OnCl
|
|
|
popupWindow.showAtLocation(activity.getWindow().getDecorView(), Gravity.CENTER, 0, 0);
|
|
|
}
|
|
|
|
|
|
+
|
|
|
+ /**
|
|
|
+ * @desc:百度自动更新 下载回调
|
|
|
+ * @author：Arison on 2018/8/9
|
|
|
+ */
|
|
|
+ private static class UpdateDownloadCallback implements CPUpdateDownloadCallback {
|
|
|
+
|
|
|
+ @Override
|
|
|
+ public void onDownloadComplete(String apkPath) {
|
|
|
+ NotifyUtil.cancelAll();
|
|
|
+ BDAutoUpdateSDK.cpUpdateInstall(MyApplication.getInstance(), apkPath);
|
|
|
+ }
|
|
|
+
|
|
|
+ @Override
|
|
|
+ public void onStart() {
|
|
|
+
|
|
|
+ }
|
|
|
+
|
|
|
+ @Override
|
|
|
+ public void onPercent(int percent, long rcvLen, long fileSize) {
|
|
|
+ LogUtil.d("SettingActivity","percent:"+percent+"fileSize:"+Integer.valueOf(String.valueOf(fileSize))+" rcvLen："+rcvLen);
|
|
|
+ NotifyUtil.buildProgress(102,R.drawable.uuu,"正在下载,共"+byteToMb(fileSize),percent,100).show();
|
|
|
+ }
|
|
|
+
|
|
|
+ @Override
|
|
|
+ public void onFail(Throwable error, String content) {
|
|
|
+
|
|
|
+ }
|
|
|
+
|
|
|
+ @Override
|
|
|
+ public void onStop() {
|
|
|
+
|
|
|
+ }
|
|
|
+
|
|
|
+ }
|
|
|
+
|
|
|
+ private static String byteToMb(long fileSize) {
|
|
|
+ float size = ((float) fileSize) / (1024f * 1024f);
|
|
|
+ return String.format("%.2fMB", size);
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
+ /**
|
|
|
+ * @desc:
|
|
|
+ * @author：Arison on 2018/8/9
|
|
|
+ */
|
|
|
+ public class MyCPCheckUpdateCallback implements CPCheckUpdateCallback {
|
|
|
+
|
|
|
+ @Override
|
|
|
+ public void onCheckUpdateCallback(final AppUpdateInfo info, AppUpdateInfoForInstall infoForInstall) {
|
|
|
+ if (infoForInstall != null && !TextUtils.isEmpty(infoForInstall.getInstallPath())) {
|
|
|
+ BDAutoUpdateSDK.cpUpdateInstall(getApplicationContext(), infoForInstall.getInstallPath());
|
|
|
+ } else if (info != null) {
|
|
|
+ showUpdateVersionPopup(SettingActivity.this,info);
|
|
|
+ } else {
|
|
|
+ PopupWindowHelper.showAlart(SettingActivity.this,
|
|
|
+ getString(R.string.app_dialog_title), getString(R.string.set_isnewVersion)
|
|
|
+ , new PopupWindowHelper.OnSelectListener() {
|
|
|
+ @Override
|
|
|
+ public void select(boolean selectOk) {
|
|
|
+ dialog.dismiss();
|
|
|
+ }
|
|
|
+ });
|
|
|
+ }
|
|
|
+ dialog.dismiss();
|
|
|
+ }
|
|
|
}
|
|
|
+
|
|
|
+
|
|
|
+ public static PopupWindow updatePopupWindow = null;
|
|
|
+ public static void showUpdateVersionPopup(final Activity activity, final AppUpdateInfo info){
|
|
|
+ updatePopupWindow = null;
|
|
|
+ View view = null;
|
|
|
+ Button bt_update;
|
|
|
+ Button bt_noUpdate;
|
|
|
+ TextView tv_apkVersion;
|
|
|
+ TextView tv_update_content;
|
|
|
+ WindowManager windowManager = (WindowManager) activity.getSystemService(Context.WINDOW_SERVICE);
|
|
|
+ if (updatePopupWindow == null) {
|
|
|
+ LayoutInflater layoutInflater = (LayoutInflater) activity.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
|
|
|
+ view = layoutInflater.inflate(R.layout.pop_update_version, null);
|
|
|
+ bt_update=view.findViewById(R.id.bt_update);
|
|
|
+ bt_noUpdate=view.findViewById(R.id.bt_noUpdate);
|
|
|
+ tv_update_content=view.findViewById(R.id.tv_update_content);
|
|
|
+ tv_apkVersion=view.findViewById(R.id.tv_apkVersion);
|
|
|
+ tv_apkVersion.setText( SystemUtil.getVersionName(activity)+"-->v"+info.getAppVersionName()+"/"+byteToMb(info.getAppSize()));
|
|
|
+ tv_update_content.setText(info.getAppChangeLog());
|
|
|
+ bt_update.setOnClickListener(new View.OnClickListener() {
|
|
|
+ @Override
|
|
|
+ public void onClick(View view) {
|
|
|
+ updatePopupWindow.dismiss();
|
|
|
+ ToastUtil.showToast(MyApplication.getInstance(),"开始下载...");
|
|
|
+ BDAutoUpdateSDK.cpUpdateDownload(activity, info, new UpdateDownloadCallback());
|
|
|
+ }
|
|
|
+ });
|
|
|
+
|
|
|
+ bt_noUpdate.setOnClickListener(new View.OnClickListener() {
|
|
|
+ @Override
|
|
|
+ public void onClick(View view) {
|
|
|
+ updatePopupWindow.dismiss();
|
|
|
+ }
|
|
|
+ });
|
|
|
+ updatePopupWindow = new PopupWindow(view, windowManager.getDefaultDisplay().getWidth() - DensityUtil.dp2px(50), LinearLayout.LayoutParams.WRAP_CONTENT);
|
|
|
+ }
|
|
|
+ updatePopupWindow.setFocusable(true);
|
|
|
+ updatePopupWindow.setOutsideTouchable(true);
|
|
|
+ updatePopupWindow.setOnDismissListener(new PopupWindow.OnDismissListener() {
|
|
|
+ @Override
|
|
|
+ public void onDismiss() {
|
|
|
+ DisplayUtil.backgroundAlpha(activity, 1f);
|
|
|
+ }
|
|
|
+ });
|
|
|
+ DisplayUtil.backgroundAlpha(activity, 0.5f);
|
|
|
+ updatePopupWindow.setBackgroundDrawable(new BitmapDrawable());
|
|
|
+ updatePopupWindow.setHeight(ViewGroup.LayoutParams.WRAP_CONTENT);
|
|
|
+ updatePopupWindow.showAtLocation(activity.getWindow().getDecorView(), Gravity.CENTER, 0, 0);
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
+}
|
Arison