diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 4d8f392..f509da4 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,6 +1,8 @@ - + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_setting.xml b/app/src/main/res/layout/activity_setting.xml index b2f18bc..7d01ed3 100644 --- a/app/src/main/res/layout/activity_setting.xml +++ b/app/src/main/res/layout/activity_setting.xml @@ -212,7 +212,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginStart="@dimen/_21dp" - android:text="@string/nei_setting" + android:text="@string/net_setting" android:textColor="@color/white" android:textSize="@dimen/_36dp" /> diff --git a/app/src/main/res/mipmap-hdpi/ic_value_used.png b/app/src/main/res/mipmap-hdpi/ic_value_used.png new file mode 100644 index 0000000..e984669 Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_value_used.png differ diff --git a/app/src/main/res/mipmap-hdpi/ic_wifi_setting.png b/app/src/main/res/mipmap-hdpi/ic_wifi_setting.png new file mode 100644 index 0000000..1264900 Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_wifi_setting.png differ diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index ac71799..889e3e5 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -15,7 +15,8 @@ 传感器设置 传感器阈值设置 云平台 - 网络参数设置 + 网络参数设置 + WIFI设置 恢复出厂设置 同步传感器数据 同步报警数据