From 3bd6e9023e011336da840e11a9d48bb31c7a0261 Mon Sep 17 00:00:00 2001
From: 陈奇 <1650699704@qq.com>
Date: Wed, 07 Nov 2018 09:31:59 +0800
Subject: [PATCH] [*]将电磁版本的唤醒心跳改成两秒，唤醒之后回到30一次心跳 [*]整体版本页面显示的绝对安全换成了安全 [*]自定义语音修改和优化，添加了无声的选择
---
app/src/main/java/com/moral/yunfushao/fragment/FragmentSettings.java | 175 +++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 130 insertions(+), 45 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 585a957..40922d2 100644
--- a/app/src/main/java/com/moral/yunfushao/fragment/FragmentSettings.java
+++ b/app/src/main/java/com/moral/yunfushao/fragment/FragmentSettings.java
@@ -1,12 +1,16 @@
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.CompoundButton;
+import android.widget.ListView;
import android.widget.RelativeLayout;
import android.widget.TextView;
@@ -27,7 +31,6 @@
import com.moral.yunfushao.httputils.HttpUtils;
import com.moral.yunfushao.model.EventMessage;
import com.moral.yunfushao.model.VoiceBean;
-import com.moral.yunfushao.utils.DebugUtils;
import org.greenrobot.eventbus.EventBus;
@@ -42,11 +45,12 @@
public class FragmentSettings extends BaseFragment {
private TextView tv_version;
- private RelativeLayout rl_setvoice,rl_refresh;
+ private RelativeLayout rl_setvoice, rl_refresh;
private Button bt_sure;
- private Button bt_look;
- private SwitchCompat sc_open,sc_male;
- private int refreshIndex=0;
+ private Button bt_look, sc_male;
+ private SwitchCompat sc_open;
+ private int refreshIndex = 0;
+
@Override
protected int getLayoutId() {
return R.layout.fragment_setting_layout;
@@ -61,17 +65,11 @@
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());
+ tv_version.setText("������������V" + getVersion());
+
// bt_look.setVisibility(DebugUtils.debug_mode ? View.VISIBLE : View.GONE);
bt_look.setVisibility(View.GONE);
- if (MainApp.theApp.sharedPreferencesUtil.getVoiceType() == 0) {
- sc_male.setChecked(false);
- sc_male.setText("���");
- }else{
- sc_male.setChecked(true);
- sc_male.setText("���");
- }
}
@Override
@@ -82,40 +80,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.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
+
+ sc_male.setOnClickListener(new View.OnClickListener() {
@Override
- public void onCheckedChanged(CompoundButton compoundButton, boolean b) {
- if(b){
- 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";
- }else{
- 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";
- }
- reset();
+ 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);
+ 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
@@ -124,17 +205,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;
}
}
@@ -172,7 +253,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);
@@ -182,6 +263,7 @@
/**
* ������������������������������������['refresh_frequency', 'video', 'is_open_upload']
+ *
* @param field
* @param value
*/
@@ -195,9 +277,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();
@@ -215,7 +297,7 @@
}
@Override
- public void onFail(int errno,String s) {
+ public void onFail(int errno, String s) {
mToatUtils.showSingletonToast(s);
if (progressDialog.isShowing()) {
progressDialog.dismiss();
@@ -226,6 +308,7 @@
/**
* ���������������
+ *
* @return ������������������������
*/
public String getVersion() {
@@ -241,6 +324,7 @@
}
private ArrayList<VoiceBean> voiceList = new ArrayList<>();
+
private void reset() {
voiceList.clear();
VoiceBean voiceBean = new VoiceBean();
@@ -265,5 +349,6 @@
EventMessage eventMessage = new EventMessage();
eventMessage.setType(AppConfig.SET_VOICE);
EventBus.getDefault().post(eventMessage);
+ mToatUtils.showSingleLongToast("������������������");
}
}
--
Gitblit v1.8.0