[*]将电磁版本的唤醒心跳改成两秒，唤醒之后回到30一次心跳 [*]整体版本页面显示的绝对安全换成了安全 [*]自定义语音修改和优化，添加了无声的选择

陈奇

2018-11-07 3bd6e9023e011336da840e11a9d48bb31c7a0261

 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;

@@ -44,9 +47,10 @@
    private TextView tv_version;
    private RelativeLayout rl_setvoice,rl_refresh;
    private Button bt_sure;
    private Button bt_look;
    private SwitchCompat sc_open,sc_male;
    private Button bt_look, sc_male;
    private SwitchCompat sc_open;
    private int refreshIndex=0;

    @Override
    protected int getLayoutId() {
        return R.layout.fragment_setting_layout;
@@ -63,15 +67,9 @@
        tv_version = findView(R.id.tv_version);
        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
@@ -89,23 +87,11 @@
                }
            }
        });
        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();
            }
        });

@@ -116,6 +102,101 @@
                  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
@@ -182,6 +263,7 @@

    /**
     * 字段名称，目前仅支持修改['refresh_frequency', 'video', 'is_open_upload']
     *
     * @param field
     * @param value
     */
@@ -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("铃声设置成功");
    }
}