From 1b6d4163ff60828aa6e5043ad29d2167801caac7 Mon Sep 17 00:00:00 2001
From: haijiang <181069201@qq.com>
Date: Wed, 18 Apr 2018 17:24:20 +0800
Subject: [PATCH] 修复bug，加入重连，铃声选择，小时数据
---
app/src/main/java/com/moral/yunfushao/fragment/FragmentSettings.java | 30 +++++++++++++++++++++++++++++-
1 files changed, 29 insertions(+), 1 deletions(-)
diff --git a/app/src/main/java/com/moral/yunfushao/fragment/FragmentSettings.java b/app/src/main/java/com/moral/yunfushao/fragment/FragmentSettings.java
index 9b14db3..cb7a3c5 100644
--- a/app/src/main/java/com/moral/yunfushao/fragment/FragmentSettings.java
+++ b/app/src/main/java/com/moral/yunfushao/fragment/FragmentSettings.java
@@ -1,10 +1,13 @@
package com.moral.yunfushao.fragment;
import android.content.Intent;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
import android.support.v7.widget.SwitchCompat;
import android.view.View;
import android.widget.Button;
import android.widget.RelativeLayout;
+import android.widget.TextView;
import com.bigkoo.pickerview.OptionsPickerView;
import com.lzy.okgo.cache.CacheMode;
@@ -16,8 +19,12 @@
import com.moral.yunfushao.activity.VoiceSetActivity;
import com.moral.yunfushao.base.BaseFragment;
import com.moral.yunfushao.common.API;
+import com.moral.yunfushao.common.AppConfig;
import com.moral.yunfushao.httputils.HttpCallBack;
import com.moral.yunfushao.httputils.HttpUtils;
+import com.moral.yunfushao.model.EventMessage;
+
+import org.greenrobot.eventbus.EventBus;
import java.util.ArrayList;
import java.util.HashMap;
@@ -29,6 +36,7 @@
*/
public class FragmentSettings extends BaseFragment {
+ private TextView tv_version;
private RelativeLayout rl_setvoice,rl_refresh;
private Button bt_sure;
private SwitchCompat sc_open;
@@ -44,6 +52,8 @@
rl_refresh = findView(R.id.rl_refresh);
bt_sure = findView(R.id.bt_sure);
sc_open = findView(R.id.sc_open);
+ tv_version = findView(R.id.tv_version);
+ tv_version.setText("������������V"+getVersion());
}
@Override
@@ -145,7 +155,9 @@
}else if("is_open_upload".equals(field)){
MainApp.theApp.sharedPreferencesUtil.setUpload(Integer.parseInt(value));
}
-
+ EventMessage event = new EventMessage();
+ event.setType(AppConfig.CHANGE_SETTING);
+ EventBus.getDefault().post(event);
if (progressDialog.isShowing()) {
progressDialog.dismiss();
}
@@ -166,4 +178,20 @@
}
});
}
+
+ /**
+ * ���������������
+ * @return ������������������������
+ */
+ public String getVersion() {
+ try {
+ PackageManager manager = getActivity().getPackageManager();
+ PackageInfo info = manager.getPackageInfo(getActivity().getPackageName(), 0);
+ String version = info.versionName;
+ return version;
+ } catch (Exception e) {
+ e.printStackTrace();
+ return "1.0";
+ }
+ }
}
--
Gitblit v1.8.0