From 17d97f58265510ceda0b38959a90424ee07b6910 Mon Sep 17 00:00:00 2001
From: 陈奇 <1650699704@qq.com>
Date: Tue, 13 Nov 2018 11:42:07 +0800
Subject: [PATCH] 1.0.3-1测试版本 [*]修改重新连接的方式 [*]修改商城连接 [*]修改心跳机制 [*]主要针对oppo和vivo机型添加开启定位服务
---
app/src/main/java/com/moral/yunfushao/fragment/FragmentSettings.java | 206 +++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 191 insertions(+), 15 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 b3964bc..dd34366 100644
--- a/app/src/main/java/com/moral/yunfushao/fragment/FragmentSettings.java
+++ b/app/src/main/java/com/moral/yunfushao/fragment/FragmentSettings.java
@@ -1,18 +1,28 @@
package com.moral.yunfushao.fragment;
+import android.app.AlertDialog;
+import android.content.DialogInterface;
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.AdapterView;
+import android.widget.ArrayAdapter;
import android.widget.Button;
+import android.widget.ListView;
import android.widget.RelativeLayout;
+import android.widget.TextView;
import com.bigkoo.pickerview.OptionsPickerView;
import com.lzy.okgo.cache.CacheMode;
import com.moral.andbrickslib.utils.ActivityManager;
+import com.moral.andbrickslib.utils.FastJsonTools;
import com.moral.yunfushao.MainActivity;
import com.moral.yunfushao.MainApp;
import com.moral.yunfushao.R;
import com.moral.yunfushao.activity.LoginActivity;
+import com.moral.yunfushao.activity.TestActivity;
import com.moral.yunfushao.activity.VoiceSetActivity;
import com.moral.yunfushao.base.BaseFragment;
import com.moral.yunfushao.common.API;
@@ -20,6 +30,7 @@
import com.moral.yunfushao.httputils.HttpCallBack;
import com.moral.yunfushao.httputils.HttpUtils;
import com.moral.yunfushao.model.EventMessage;
+import com.moral.yunfushao.model.VoiceBean;
import org.greenrobot.eventbus.EventBus;
@@ -33,10 +44,13 @@
*/
public class FragmentSettings extends BaseFragment {
- private RelativeLayout rl_setvoice,rl_refresh;
+ private TextView tv_version;
+ private RelativeLayout rl_setvoice, rl_refresh;
private Button bt_sure;
+ private Button bt_look, sc_male;
private SwitchCompat sc_open;
- private int refreshIndex=0;
+ private int refreshIndex = 0;
+
@Override
protected int getLayoutId() {
return R.layout.fragment_setting_layout;
@@ -47,7 +61,12 @@
rl_setvoice = findView(R.id.rl_setvoice);
rl_refresh = findView(R.id.rl_refresh);
bt_sure = findView(R.id.bt_sure);
+ bt_look = findView(R.id.bt_look);
sc_open = findView(R.id.sc_open);
+ sc_male = findView(R.id.sc_male);
+ tv_version = findView(R.id.tv_version);
+ tv_version.setText("������������V" + getVersion());
+ bt_look.setVisibility(View.GONE);
}
@Override
@@ -58,13 +77,123 @@
sc_open.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
- if(sc_open.isChecked()){
- update("is_open_upload","1");
- }else{
- update("is_open_upload","0");
+ if (sc_open.isChecked()) {
+ update("is_open_upload", "1");
+ } else {
+ update("is_open_upload", "0");
}
}
});
+
+ sc_male.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ chooseSoundCategory();
+ }
+ });
+
+ bt_look.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View view) {
+ Intent intent = new Intent(getActivity(), TestActivity.class);
+ startActivity(intent);
+ }
+ });
+ }
+
+ @Override
+ public void onResume() {
+ super.onResume();
+ switch (MainApp.theApp.sharedPreferencesUtil.getVoiceType()) {
+ case 0:
+ sc_male.setText("������");
+ break;
+ case 1:
+ sc_male.setText("������");
+ break;
+ case 2:
+ sc_male.setText("������");
+ break;
+ case 3:
+ sc_male.setText("���������");
+ break;
+ }
+ }
+
+ /**
+ * ���������������������
+ */
+ private void chooseSoundCategory() {
+ final AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
+ ListView listView = new ListView(getActivity());
+ ArrayAdapter<String> arrayAdapter = new ArrayAdapter<>(getActivity(),
+ android.R.layout.simple_expandable_list_item_1,
+ new String[]{"������", "������", "������"});
+ listView.setAdapter(arrayAdapter);
+ builder.setTitle("������������������!");
+ builder.setIcon(R.mipmap.icon_voice);
+ builder.setView(listView);
+ final AlertDialog alertDialog = builder.create();
+ alertDialog.show();
+ listView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
+ @Override
+ public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+ alertDialog.dismiss();
+ ejectTips(position);
+ }
+ });
+ }
+
+ /**
+ * ���������������������
+ */
+ private void ejectTips(final int position) {
+ final AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
+ builder.setTitle("���������������");
+ builder.setIcon(R.mipmap.tips);
+ builder.setMessage("������������������������������������������������������������������������");
+ builder.setNegativeButton("������", new DialogInterface.OnClickListener() {
+ @Override
+ public void onClick(DialogInterface dialog, int which) {
+ dialog.dismiss();
+ setUpDefaultRingtone(position);
+ }
+ });
+ builder.setPositiveButton("������", new DialogInterface.OnClickListener() {
+ @Override
+ public void onClick(DialogInterface dialog, int which) {
+ dialog.dismiss();
+ }
+ });
+ final AlertDialog alertDialog = builder.create();
+ alertDialog.show();
+ }
+
+ private void setUpDefaultRingtone(int type) {
+ switch (type) {
+ case 0:
+ sc_male.setText("������");
+ MainApp.theApp.sharedPreferencesUtil.saveVoiceType(0);
+ AppConfig.voideUrl1 = "http://yfsapi.7drlb.com/video/boy/music.mp3";
+ AppConfig.voideUrl2 = "http://yfsapi.7drlb.com/video/boy/music1.mp3";
+ AppConfig.voideUrl3 = "http://yfsapi.7drlb.com/video/boy/music2.mp3";
+ break;
+ case 1:
+ sc_male.setText("������");
+ MainApp.theApp.sharedPreferencesUtil.saveVoiceType(1);
+ AppConfig.voideUrl1 = "http://yfsapi.7drlb.com/video/girl/music.mp3";
+ AppConfig.voideUrl2 = "http://yfsapi.7drlb.com/video/girl/music1.mp3";
+ AppConfig.voideUrl3 = "http://yfsapi.7drlb.com/video/girl/music2.mp3";
+ break;
+ case 2:
+ sc_male.setText("������");
+ MainApp.theApp.sharedPreferencesUtil.saveVoiceType(2);
+ AppConfig.voideUrl1 = null;
+ AppConfig.voideUrl2 = null;
+ AppConfig.voideUrl3 = null;
+ break;
+ }
+ reset();
}
@Override
@@ -73,17 +202,17 @@
timeList.add("20s");
timeList.add("30s");
int open = MainApp.theApp.sharedPreferencesUtil.getLoginInfo().getIs_open_upload();
- if(open == 0){
+ if (open == 0) {
sc_open.setChecked(false);
- }else{
+ } else {
sc_open.setChecked(true);
}
int refresh = MainApp.theApp.sharedPreferencesUtil.getLoginInfo().getRefresh_frequency();
- if(refresh == 10){
+ if (refresh == 10) {
refreshIndex = 0;
- }else if(refresh == 20){
+ } else if (refresh == 20) {
refreshIndex = 1;
- }else if(refresh == 30){
+ } else if (refresh == 30) {
refreshIndex = 2;
}
}
@@ -121,7 +250,7 @@
@Override
public void onOptionsSelect(int options1, int options2, int options3, View v) {
refreshIndex = options1;
- update("refresh_frequency",(options1+1)*10+"");
+ update("refresh_frequency", (options1 + 1) * 10 + "");
}
}).setOutSideCancelable(true).build();
sexView.setSelectOptions(refreshIndex);
@@ -131,6 +260,7 @@
/**
* ������������������������������������['refresh_frequency', 'video', 'is_open_upload']
+ *
* @param field
* @param value
*/
@@ -144,9 +274,9 @@
@Override
public void onSuccess(String res, String msg) {
mToatUtils.showSingletonToast(msg);
- if("refresh_frequency".equals(field)){
+ if ("refresh_frequency".equals(field)) {
MainApp.theApp.sharedPreferencesUtil.setRefreh(Integer.parseInt(value));
- }else if("is_open_upload".equals(field)){
+ } else if ("is_open_upload".equals(field)) {
MainApp.theApp.sharedPreferencesUtil.setUpload(Integer.parseInt(value));
}
EventMessage event = new EventMessage();
@@ -164,7 +294,7 @@
}
@Override
- public void onFail(int errno,String s) {
+ public void onFail(int errno, String s) {
mToatUtils.showSingletonToast(s);
if (progressDialog.isShowing()) {
progressDialog.dismiss();
@@ -172,4 +302,50 @@
}
});
}
+
+ /**
+ * ���������������
+ *
+ * @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";
+ }
+ }
+
+ private ArrayList<VoiceBean> voiceList = new ArrayList<>();
+
+ private void reset() {
+ voiceList.clear();
+ VoiceBean voiceBean = new VoiceBean();
+ voiceBean.setId(0);
+ voiceBean.setRes(AppConfig.voideUrl1);
+ voiceBean.setName("������������������");
+ voiceBean.setVoiceName("������");
+ voiceList.add(voiceBean);
+ voiceBean = new VoiceBean();
+ voiceBean.setId(1);
+ voiceBean.setRes(AppConfig.voideUrl2);
+ voiceBean.setName("������������������");
+ voiceBean.setVoiceName("������");
+ voiceList.add(voiceBean);
+ voiceBean = new VoiceBean();
+ voiceBean.setId(2);
+ voiceBean.setRes(AppConfig.voideUrl3);
+ voiceBean.setName("������������������");
+ voiceBean.setVoiceName("������");
+ voiceList.add(voiceBean);
+ MainApp.theApp.sharedPreferencesUtil.saveVideoList(FastJsonTools.toJson(voiceList));
+ EventMessage eventMessage = new EventMessage();
+ eventMessage.setType(AppConfig.SET_VOICE);
+ EventBus.getDefault().post(eventMessage);
+ mToatUtils.showSingleLongToast("������������������");
+ }
}
--
Gitblit v1.8.0