|
@@ -4,12 +4,14 @@ import android.app.Dialog;
|
|
|
import android.content.Intent;
|
|
import android.content.Intent;
|
|
|
import android.content.pm.PackageInfo;
|
|
import android.content.pm.PackageInfo;
|
|
|
import android.content.pm.PackageManager;
|
|
import android.content.pm.PackageManager;
|
|
|
|
|
+import android.os.Looper;
|
|
|
import android.os.Message;
|
|
import android.os.Message;
|
|
|
import android.text.TextUtils;
|
|
import android.text.TextUtils;
|
|
|
import android.view.View;
|
|
import android.view.View;
|
|
|
import android.widget.ImageView;
|
|
import android.widget.ImageView;
|
|
|
import android.widget.LinearLayout;
|
|
import android.widget.LinearLayout;
|
|
|
import android.widget.TextView;
|
|
import android.widget.TextView;
|
|
|
|
|
+import android.widget.Toast;
|
|
|
|
|
|
|
|
import org.greenrobot.eventbus.Subscribe;
|
|
import org.greenrobot.eventbus.Subscribe;
|
|
|
import org.greenrobot.eventbus.ThreadMode;
|
|
import org.greenrobot.eventbus.ThreadMode;
|
|
@@ -64,8 +66,12 @@ public class MyFragment extends MyLazyFragment<HomeActivity> {
|
|
|
SettingBar my_sb_information;
|
|
SettingBar my_sb_information;
|
|
|
@BindView(R.id.sb_setting_explain)
|
|
@BindView(R.id.sb_setting_explain)
|
|
|
SettingBar sb_setting_explain;
|
|
SettingBar sb_setting_explain;
|
|
|
|
|
+ @BindView(R.id.sb_setting_abouts)
|
|
|
|
|
+ SettingBar settingBar;
|
|
|
|
|
|
|
|
String switch_state = "close";
|
|
String switch_state = "close";
|
|
|
|
|
+ int verson_code = 0;
|
|
|
|
|
+ String verson_name = "";
|
|
|
|
|
|
|
|
|
|
|
|
|
private List<String> logOutList = new ArrayList<>();
|
|
private List<String> logOutList = new ArrayList<>();
|
|
@@ -86,7 +92,20 @@ public class MyFragment extends MyLazyFragment<HomeActivity> {
|
|
|
|
|
|
|
|
@Override
|
|
@Override
|
|
|
protected void initView() {
|
|
protected void initView() {
|
|
|
|
|
+ //本地版本信息
|
|
|
|
|
+ PackageManager packageManager = Objects.requireNonNull(getActivity()).getPackageManager();
|
|
|
|
|
+ PackageInfo info = null;
|
|
|
|
|
+
|
|
|
|
|
+ try {
|
|
|
|
|
+ info = packageManager.getPackageInfo(getActivity().getPackageName(), 0);
|
|
|
|
|
+ verson_code = info.versionCode;
|
|
|
|
|
+ verson_name = info.versionName.toString();
|
|
|
|
|
+// tv_sb_versioninfo.text = "V$verson_name"
|
|
|
|
|
+ } catch (Exception e) {
|
|
|
|
|
+ e.printStackTrace();
|
|
|
|
|
+ }
|
|
|
|
|
|
|
|
|
|
+ settingBar.setRightText("V " + verson_name);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
@Override
|
|
@Override
|
|
@@ -128,7 +147,7 @@ public class MyFragment extends MyLazyFragment<HomeActivity> {
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
@OnClick(value = {R.id.my_img_head, R.id.my_sb_information, R.id.sb_setting_explain, R.id.sb_setting_about, R.id.my_btn_exit,
|
|
@OnClick(value = {R.id.my_img_head, R.id.my_sb_information, R.id.sb_setting_explain, R.id.sb_setting_about, R.id.my_btn_exit,
|
|
|
- R.id.sb_vaccinate_people, R.id.iv_switch_close, R.id.sb_privacy_agreement1,R.id.sb_privacy_agreement2, R.id.iv_title_return,
|
|
|
|
|
|
|
+ R.id.sb_vaccinate_people, R.id.iv_switch_close, R.id.sb_privacy_agreement1, R.id.sb_privacy_agreement2, R.id.iv_title_return,
|
|
|
R.id.sb_setting_abouts})
|
|
R.id.sb_setting_abouts})
|
|
|
public void onViewClicked(View view) {
|
|
public void onViewClicked(View view) {
|
|
|
switch (view.getId()) {
|
|
switch (view.getId()) {
|
|
@@ -170,7 +189,7 @@ public class MyFragment extends MyLazyFragment<HomeActivity> {
|
|
|
//关于
|
|
//关于
|
|
|
startActivity(AboutActivity.class);
|
|
startActivity(AboutActivity.class);
|
|
|
break;
|
|
break;
|
|
|
- case R.id.sb_setting_abouts:
|
|
|
|
|
|
|
+ case R.id.sb_setting_abouts: //版本更新
|
|
|
getVersonInfoApk();
|
|
getVersonInfoApk();
|
|
|
break;
|
|
break;
|
|
|
case R.id.sb_privacy_agreement1: //隐私政策
|
|
case R.id.sb_privacy_agreement1: //隐私政策
|
|
@@ -218,12 +237,9 @@ public class MyFragment extends MyLazyFragment<HomeActivity> {
|
|
|
* 获取网络版本信息
|
|
* 获取网络版本信息
|
|
|
*/
|
|
*/
|
|
|
private void getVersonInfoApk() {
|
|
private void getVersonInfoApk() {
|
|
|
-
|
|
|
|
|
HashMap<String, String> map = new HashMap();
|
|
HashMap<String, String> map = new HashMap();
|
|
|
- map.put("os", "3");
|
|
|
|
|
-
|
|
|
|
|
-
|
|
|
|
|
- String url = HttpUtils.attachHttpGetParams("http://125.124.132.156:81/prod-api/vvm/version/checkUpdate", map);
|
|
|
|
|
|
|
+ map.put("os", "4");
|
|
|
|
|
+ String url = HttpUtils.attachHttpGetParams("http://vvm.vandh.org:81/prod-api/vvm/version/checnUpdateAndorid", map);
|
|
|
HttpUtils.doGet(url, new Callback() {
|
|
HttpUtils.doGet(url, new Callback() {
|
|
|
@Override
|
|
@Override
|
|
|
public void onFailure(Call call, IOException e) {
|
|
public void onFailure(Call call, IOException e) {
|
|
@@ -239,7 +255,7 @@ public class MyFragment extends MyLazyFragment<HomeActivity> {
|
|
|
Gson gson = new Gson();
|
|
Gson gson = new Gson();
|
|
|
VersionBean versionBean = gson.fromJson(aa, VersionBean.class);
|
|
VersionBean versionBean = gson.fromJson(aa, VersionBean.class);
|
|
|
if (versionBean.getCode() == 200) {
|
|
if (versionBean.getCode() == 200) {
|
|
|
- ifUpApk(versionBean.getData().getVersion(), versionBean.getData().getUrl());
|
|
|
|
|
|
|
+ ifUpApk(versionBean.getData().getVersion(), versionBean.getData().getUrl(), versionBean.getData().getNum());
|
|
|
} else {
|
|
} else {
|
|
|
try {
|
|
try {
|
|
|
toast(versionBean.getMsg());
|
|
toast(versionBean.getMsg());
|
|
@@ -251,24 +267,9 @@ public class MyFragment extends MyLazyFragment<HomeActivity> {
|
|
|
});
|
|
});
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- private void ifUpApk(String version, String url) {
|
|
|
|
|
- //本地版本信息
|
|
|
|
|
- PackageManager packageManager = Objects.requireNonNull(getActivity()).getPackageManager();
|
|
|
|
|
- PackageInfo info = null;
|
|
|
|
|
- int verson_code;
|
|
|
|
|
- String verson_name = "";
|
|
|
|
|
- try {
|
|
|
|
|
- info = packageManager.getPackageInfo(getActivity().getPackageName(), 0);
|
|
|
|
|
- verson_code = info.versionCode;
|
|
|
|
|
- verson_name = info.versionName.toString();
|
|
|
|
|
-// tv_sb_versioninfo.text = "V$verson_name"
|
|
|
|
|
- } catch (Exception e) {
|
|
|
|
|
- e.printStackTrace();
|
|
|
|
|
- }
|
|
|
|
|
-
|
|
|
|
|
-
|
|
|
|
|
- if (verson_name != "" || version != "") {
|
|
|
|
|
- if (verson_name != version) {
|
|
|
|
|
|
|
+ private void ifUpApk(String version, String url, String number) {
|
|
|
|
|
+ if (verson_code != 0 || version != null) {
|
|
|
|
|
+ if (verson_code < Integer.valueOf(number)) {
|
|
|
UiConfig uiConfig = new UiConfig();
|
|
UiConfig uiConfig = new UiConfig();
|
|
|
uiConfig.setUiType(UiType.CUSTOM);
|
|
uiConfig.setUiType(UiType.CUSTOM);
|
|
|
uiConfig.setCustomLayoutId(R.layout.dialog_up_apk_layout);
|
|
uiConfig.setCustomLayoutId(R.layout.dialog_up_apk_layout);
|
|
@@ -283,15 +284,19 @@ public class MyFragment extends MyLazyFragment<HomeActivity> {
|
|
|
}
|
|
}
|
|
|
})
|
|
})
|
|
|
.apkUrl(url)
|
|
.apkUrl(url)
|
|
|
- .updateTitle("V$version_name")
|
|
|
|
|
|
|
+ .updateTitle("V " + version)
|
|
|
.update();
|
|
.update();
|
|
|
} else {
|
|
} else {
|
|
|
-// Toast.makeText(activity, "当前已是最新版本!", Toast.LENGTH_LONG).show()
|
|
|
|
|
- toast("当前已是最新版本!");
|
|
|
|
|
|
|
+ Looper.prepare();
|
|
|
|
|
+ Toast.makeText(getActivity(), "当前已是最新版本!", Toast.LENGTH_LONG).show();
|
|
|
|
|
+// toast("当前已是最新版本!");
|
|
|
|
|
+ Looper.loop();
|
|
|
}
|
|
}
|
|
|
} else {
|
|
} else {
|
|
|
-// Toast.makeText(activity, "获取最新版本信息失败!", Toast.LENGTH_LONG).show()
|
|
|
|
|
- toast("获取最新版本信息失败!");
|
|
|
|
|
|
|
+ Looper.prepare();
|
|
|
|
|
+ Toast.makeText(getActivity(), "获取最新版本信息失败!", Toast.LENGTH_LONG).show();
|
|
|
|
|
+// toast("获取最新版本信息失败!");
|
|
|
|
|
+ Looper.loop();
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|