1.0.3-1测试版本 [*]修改重新连接的方式 [*]修改商城连接 [*]修改心跳机制 [*]主要针对oppo和vivo机型添加开启定位服务

陈奇

2018-11-13 17d97f58265510ceda0b38959a90424ee07b6910

 app/src/main/res/layout/fragment_setting_layout.xml

@@ -43,17 +43,19 @@
        <TextView
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:text="设置时间"
            android:layout_alignParentRight="true"
            android:textColor="@color/dark_gray_txt"
            android:drawableRight="@mipmap/icon_jiantou"
            android:drawablePadding="@dimen/x6"
            android:text="设置时间"
            android:textColor="@color/dark_gray_txt"
            android:textSize="16sp" />
    </RelativeLayout>

    <View
        android:layout_width="match_parent"
        android:layout_height="1dp"
        android:background="@color/gray_line"/>
        android:background="@color/gray_line" />

    <RelativeLayout
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
@@ -79,12 +81,14 @@
            android:id="@+id/sc_open"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:layout_alignParentRight="true"/>
            android:layout_alignParentRight="true" />
    </RelativeLayout>

    <View
        android:layout_width="match_parent"
        android:layout_height="1dp"
        android:background="@color/gray_line"/>
        android:background="@color/gray_line" />

    <RelativeLayout
        android:id="@+id/rl_setvoice"
        android:layout_width="match_parent"
@@ -103,33 +107,39 @@
            android:layout_height="wrap_content"
            android:layout_marginLeft="@dimen/x10"
            android:layout_toRightOf="@+id/iv3"
            android:text="设置铃声"
            android:textColor="@color/dark_gray_txt"
            android:drawableRight="@mipmap/icon_jiantou"
            android:text="设置自定义铃声"
            android:textColor="@color/dark_gray_txt"
            android:textSize="16sp" />
        <android.support.v7.widget.SwitchCompat

        <Button
            android:id="@+id/sc_male"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:layout_marginRight="@dimen/x20"
            android:text="男"
            android:layout_height="@dimen/x30"
            android:layout_alignParentRight="true"
            android:layout_centerVertical="true"
            android:layout_alignParentRight="true"/>
            android:layout_marginRight="@dimen/x20"
            android:background="@drawable/choose_button"
            android:stateListAnimator="@anim/progress"
            android:text="无声"
            android:textColor="@color/dark_gray_txt" />
    </RelativeLayout>

    <View
        android:layout_width="match_parent"
        android:layout_height="1dp"
        android:background="@color/gray_line"/>
        android:background="@color/gray_line" />

    <Button
        android:id="@+id/bt_sure"
        android:layout_width="match_parent"
        android:layout_height="@dimen/x40"
        android:layout_marginLeft="@dimen/x40"
        android:layout_marginRight="@dimen/x40"
        android:layout_marginTop="@dimen/x24"
        android:layout_marginRight="@dimen/x40"
        android:background="@mipmap/bt_blue"
        android:paddingBottom="@dimen/x10"
        android:text="退出登录"
        android:gravity="center"
        android:textColor="@color/white"
        android:textSize="16sp" />

@@ -138,20 +148,21 @@
        android:layout_width="match_parent"
        android:layout_height="@dimen/x40"
        android:layout_marginLeft="@dimen/x40"
        android:layout_marginRight="@dimen/x40"
        android:layout_marginTop="@dimen/x24"
        android:layout_marginRight="@dimen/x40"
        android:background="@mipmap/bt_blue"
        android:text="查看数据"
        android:visibility="gone"
        android:gravity="center"
        android:text="查看数据"
        android:textColor="@color/white"
        android:textSize="16sp" />
        android:textSize="16sp"
        android:visibility="gone" />

    <TextView
        android:id="@+id/tv_version"
        android:layout_width="match_parent"
        android:layout_height="match_parent"
        android:gravity="center_horizontal|bottom"
        android:layout_marginBottom="30dp"
        android:gravity="center_horizontal|bottom"
        android:text="当前版本V1.0"
        android:textColor="@color/dark_gray_txt"
        android:textSize="18sp" />