diff --git a/HDFwear/Assets.xcassets/Setting/device_add_bg.imageset/Contents.json b/HDFwear/Assets.xcassets/Setting/device_add_bg.imageset/Contents.json
index aa26fdc..52178d1 100644
--- a/HDFwear/Assets.xcassets/Setting/device_add_bg.imageset/Contents.json
+++ b/HDFwear/Assets.xcassets/Setting/device_add_bg.imageset/Contents.json
@@ -5,12 +5,12 @@
"scale" : "1x"
},
{
- "filename" : "添加设备背景@2x.png",
+ "filename" : "device_add_bg@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
- "filename" : "添加设备背景@3x.png",
+ "filename" : "device_add_bg@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
diff --git a/HDFwear/Assets.xcassets/Setting/device_add_bg.imageset/device_add_bg@2x.png b/HDFwear/Assets.xcassets/Setting/device_add_bg.imageset/device_add_bg@2x.png
new file mode 100644
index 0000000..99f709b
--- /dev/null
+++ b/HDFwear/Assets.xcassets/Setting/device_add_bg.imageset/device_add_bg@2x.png
diff --git a/HDFwear/Assets.xcassets/Setting/device_add_bg.imageset/device_add_bg@3x.png b/HDFwear/Assets.xcassets/Setting/device_add_bg.imageset/device_add_bg@3x.png
new file mode 100644
index 0000000..02234e8
--- /dev/null
+++ b/HDFwear/Assets.xcassets/Setting/device_add_bg.imageset/device_add_bg@3x.png
diff --git a/HDFwear/Assets.xcassets/Setting/device_add_bg.imageset/添加设备背景@2x.png b/HDFwear/Assets.xcassets/Setting/device_add_bg.imageset/添加设备背景@2x.png
deleted file mode 100644
index a0cc403..0000000
--- a/HDFwear/Assets.xcassets/Setting/device_add_bg.imageset/添加设备背景@2x.png
+++ /dev/null
diff --git a/HDFwear/Assets.xcassets/Setting/device_add_bg.imageset/添加设备背景@3x.png b/HDFwear/Assets.xcassets/Setting/device_add_bg.imageset/添加设备背景@3x.png
deleted file mode 100644
index 1fa15e1..0000000
--- a/HDFwear/Assets.xcassets/Setting/device_add_bg.imageset/添加设备背景@3x.png
+++ /dev/null
diff --git a/HDFwear/Assets.xcassets/Setting/lift_wrist.imageset/Contents.json b/HDFwear/Assets.xcassets/Setting/lift_wrist.imageset/Contents.json
index cc16146..df4bd12 100644
--- a/HDFwear/Assets.xcassets/Setting/lift_wrist.imageset/Contents.json
+++ b/HDFwear/Assets.xcassets/Setting/lift_wrist.imageset/Contents.json
@@ -5,12 +5,12 @@
"scale" : "1x"
},
{
- "filename" : "抬腕亮屏@2x.png",
+ "filename" : "lift_wrist@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
- "filename" : "抬腕亮屏@3x.png",
+ "filename" : "lift_wrist@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
diff --git a/HDFwear/Assets.xcassets/Setting/lift_wrist.imageset/lift_wrist@2x.png b/HDFwear/Assets.xcassets/Setting/lift_wrist.imageset/lift_wrist@2x.png
new file mode 100644
index 0000000..5a6ac83
--- /dev/null
+++ b/HDFwear/Assets.xcassets/Setting/lift_wrist.imageset/lift_wrist@2x.png
diff --git a/HDFwear/Assets.xcassets/Setting/lift_wrist.imageset/lift_wrist@3x.png b/HDFwear/Assets.xcassets/Setting/lift_wrist.imageset/lift_wrist@3x.png
new file mode 100644
index 0000000..374dff9
--- /dev/null
+++ b/HDFwear/Assets.xcassets/Setting/lift_wrist.imageset/lift_wrist@3x.png
diff --git a/HDFwear/Assets.xcassets/Setting/lift_wrist.imageset/抬腕亮屏@2x.png b/HDFwear/Assets.xcassets/Setting/lift_wrist.imageset/抬腕亮屏@2x.png
deleted file mode 100644
index 41e7a5b..0000000
--- a/HDFwear/Assets.xcassets/Setting/lift_wrist.imageset/抬腕亮屏@2x.png
+++ /dev/null
diff --git a/HDFwear/Assets.xcassets/Setting/lift_wrist.imageset/抬腕亮屏@3x.png b/HDFwear/Assets.xcassets/Setting/lift_wrist.imageset/抬腕亮屏@3x.png
deleted file mode 100644
index 2a16a29..0000000
--- a/HDFwear/Assets.xcassets/Setting/lift_wrist.imageset/抬腕亮屏@3x.png
+++ /dev/null
diff --git a/HDFwear/Assets.xcassets/Setting/remote_camera.imageset/Contents.json b/HDFwear/Assets.xcassets/Setting/remote_camera.imageset/Contents.json
index a9882b9..bfeccb9 100644
--- a/HDFwear/Assets.xcassets/Setting/remote_camera.imageset/Contents.json
+++ b/HDFwear/Assets.xcassets/Setting/remote_camera.imageset/Contents.json
@@ -5,12 +5,12 @@
"scale" : "1x"
},
{
- "filename" : "遥控拍照@2x.png",
+ "filename" : "remote_camera@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
- "filename" : "遥控拍照@3x.png",
+ "filename" : "remote_camera@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
diff --git a/HDFwear/Assets.xcassets/Setting/remote_camera.imageset/remote_camera@2x.png b/HDFwear/Assets.xcassets/Setting/remote_camera.imageset/remote_camera@2x.png
new file mode 100644
index 0000000..a09c1b0
--- /dev/null
+++ b/HDFwear/Assets.xcassets/Setting/remote_camera.imageset/remote_camera@2x.png
diff --git a/HDFwear/Assets.xcassets/Setting/remote_camera.imageset/remote_camera@3x.png b/HDFwear/Assets.xcassets/Setting/remote_camera.imageset/remote_camera@3x.png
new file mode 100644
index 0000000..d3da183
--- /dev/null
+++ b/HDFwear/Assets.xcassets/Setting/remote_camera.imageset/remote_camera@3x.png
diff --git a/HDFwear/Assets.xcassets/Setting/remote_camera.imageset/遥控拍照@2x.png b/HDFwear/Assets.xcassets/Setting/remote_camera.imageset/遥控拍照@2x.png
deleted file mode 100644
index 0cfdc74..0000000
--- a/HDFwear/Assets.xcassets/Setting/remote_camera.imageset/遥控拍照@2x.png
+++ /dev/null
diff --git a/HDFwear/Assets.xcassets/Setting/remote_camera.imageset/遥控拍照@3x.png b/HDFwear/Assets.xcassets/Setting/remote_camera.imageset/遥控拍照@3x.png
deleted file mode 100644
index 227c6c4..0000000
--- a/HDFwear/Assets.xcassets/Setting/remote_camera.imageset/遥控拍照@3x.png
+++ /dev/null
diff --git a/HDFwear/Assets.xcassets/Setting/set_find.imageset/Contents.json b/HDFwear/Assets.xcassets/Setting/set_find.imageset/Contents.json
index de430ed..2ce9492 100644
--- a/HDFwear/Assets.xcassets/Setting/set_find.imageset/Contents.json
+++ b/HDFwear/Assets.xcassets/Setting/set_find.imageset/Contents.json
@@ -5,12 +5,12 @@
"scale" : "1x"
},
{
- "filename" : "查找手环@2x.png",
+ "filename" : "set_find@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
- "filename" : "查找手环@3x.png",
+ "filename" : "set_find@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
diff --git a/HDFwear/Assets.xcassets/Setting/set_find.imageset/set_find@2x.png b/HDFwear/Assets.xcassets/Setting/set_find.imageset/set_find@2x.png
new file mode 100644
index 0000000..3d23e45
--- /dev/null
+++ b/HDFwear/Assets.xcassets/Setting/set_find.imageset/set_find@2x.png
diff --git a/HDFwear/Assets.xcassets/Setting/set_find.imageset/set_find@3x.png b/HDFwear/Assets.xcassets/Setting/set_find.imageset/set_find@3x.png
new file mode 100644
index 0000000..1a2124a
--- /dev/null
+++ b/HDFwear/Assets.xcassets/Setting/set_find.imageset/set_find@3x.png
diff --git a/HDFwear/Assets.xcassets/Setting/set_find.imageset/查找手环@2x.png b/HDFwear/Assets.xcassets/Setting/set_find.imageset/查找手环@2x.png
deleted file mode 100644
index 1904593..0000000
--- a/HDFwear/Assets.xcassets/Setting/set_find.imageset/查找手环@2x.png
+++ /dev/null
diff --git a/HDFwear/Assets.xcassets/Setting/set_find.imageset/查找手环@3x.png b/HDFwear/Assets.xcassets/Setting/set_find.imageset/查找手环@3x.png
deleted file mode 100644
index 6380149..0000000
--- a/HDFwear/Assets.xcassets/Setting/set_find.imageset/查找手环@3x.png
+++ /dev/null
diff --git a/HDFwear/Assets.xcassets/Setting/set_goals.imageset/Contents.json b/HDFwear/Assets.xcassets/Setting/set_goals.imageset/Contents.json
index 69ee31c..c9c1540 100644
--- a/HDFwear/Assets.xcassets/Setting/set_goals.imageset/Contents.json
+++ b/HDFwear/Assets.xcassets/Setting/set_goals.imageset/Contents.json
@@ -5,12 +5,12 @@
"scale" : "1x"
},
{
- "filename" : "目标设置@2x.png",
+ "filename" : "set_goals@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
- "filename" : "目标设置@3x.png",
+ "filename" : "set_goals@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
diff --git a/HDFwear/Assets.xcassets/Setting/set_goals.imageset/set_goals@2x.png b/HDFwear/Assets.xcassets/Setting/set_goals.imageset/set_goals@2x.png
new file mode 100644
index 0000000..06c0b7f
--- /dev/null
+++ b/HDFwear/Assets.xcassets/Setting/set_goals.imageset/set_goals@2x.png
diff --git a/HDFwear/Assets.xcassets/Setting/set_goals.imageset/set_goals@3x.png b/HDFwear/Assets.xcassets/Setting/set_goals.imageset/set_goals@3x.png
new file mode 100644
index 0000000..b23acee
--- /dev/null
+++ b/HDFwear/Assets.xcassets/Setting/set_goals.imageset/set_goals@3x.png
diff --git a/HDFwear/Assets.xcassets/Setting/set_goals.imageset/目标设置@2x.png b/HDFwear/Assets.xcassets/Setting/set_goals.imageset/目标设置@2x.png
deleted file mode 100644
index f0ae1df..0000000
--- a/HDFwear/Assets.xcassets/Setting/set_goals.imageset/目标设置@2x.png
+++ /dev/null
diff --git a/HDFwear/Assets.xcassets/Setting/set_goals.imageset/目标设置@3x.png b/HDFwear/Assets.xcassets/Setting/set_goals.imageset/目标设置@3x.png
deleted file mode 100644
index e4d5c39..0000000
--- a/HDFwear/Assets.xcassets/Setting/set_goals.imageset/目标设置@3x.png
+++ /dev/null
diff --git a/HDFwear/Assets.xcassets/Setting/set_language.imageset/Contents.json b/HDFwear/Assets.xcassets/Setting/set_language.imageset/Contents.json
index 781e915..4b7eff5 100644
--- a/HDFwear/Assets.xcassets/Setting/set_language.imageset/Contents.json
+++ b/HDFwear/Assets.xcassets/Setting/set_language.imageset/Contents.json
@@ -5,12 +5,12 @@
"scale" : "1x"
},
{
- "filename" : "语言设置@2x.png",
+ "filename" : "set_language@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
- "filename" : "语言设置@3x.png",
+ "filename" : "set_language@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
diff --git a/HDFwear/Assets.xcassets/Setting/set_language.imageset/set_language@2x.png b/HDFwear/Assets.xcassets/Setting/set_language.imageset/set_language@2x.png
new file mode 100644
index 0000000..058361a
--- /dev/null
+++ b/HDFwear/Assets.xcassets/Setting/set_language.imageset/set_language@2x.png
diff --git a/HDFwear/Assets.xcassets/Setting/set_language.imageset/set_language@3x.png b/HDFwear/Assets.xcassets/Setting/set_language.imageset/set_language@3x.png
new file mode 100644
index 0000000..1d9f913
--- /dev/null
+++ b/HDFwear/Assets.xcassets/Setting/set_language.imageset/set_language@3x.png
diff --git a/HDFwear/Assets.xcassets/Setting/set_language.imageset/语言设置@2x.png b/HDFwear/Assets.xcassets/Setting/set_language.imageset/语言设置@2x.png
deleted file mode 100644
index 9fc10b0..0000000
--- a/HDFwear/Assets.xcassets/Setting/set_language.imageset/语言设置@2x.png
+++ /dev/null
diff --git a/HDFwear/Assets.xcassets/Setting/set_language.imageset/语言设置@3x.png b/HDFwear/Assets.xcassets/Setting/set_language.imageset/语言设置@3x.png
deleted file mode 100644
index e93c339..0000000
--- a/HDFwear/Assets.xcassets/Setting/set_language.imageset/语言设置@3x.png
+++ /dev/null
diff --git a/HDFwear/Assets.xcassets/Setting/set_other.imageset/Contents.json b/HDFwear/Assets.xcassets/Setting/set_other.imageset/Contents.json
index bdd58a8..a4977be 100644
--- a/HDFwear/Assets.xcassets/Setting/set_other.imageset/Contents.json
+++ b/HDFwear/Assets.xcassets/Setting/set_other.imageset/Contents.json
@@ -5,12 +5,12 @@
"scale" : "1x"
},
{
- "filename" : "其他设置@2x.png",
+ "filename" : "set_other@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
- "filename" : "其他设置@3x.png",
+ "filename" : "set_other@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
diff --git a/HDFwear/Assets.xcassets/Setting/set_other.imageset/set_other@2x.png b/HDFwear/Assets.xcassets/Setting/set_other.imageset/set_other@2x.png
new file mode 100644
index 0000000..a05417a
--- /dev/null
+++ b/HDFwear/Assets.xcassets/Setting/set_other.imageset/set_other@2x.png
diff --git a/HDFwear/Assets.xcassets/Setting/set_other.imageset/set_other@3x.png b/HDFwear/Assets.xcassets/Setting/set_other.imageset/set_other@3x.png
new file mode 100644
index 0000000..34cf82d
--- /dev/null
+++ b/HDFwear/Assets.xcassets/Setting/set_other.imageset/set_other@3x.png
diff --git a/HDFwear/Assets.xcassets/Setting/set_other.imageset/其他设置@2x.png b/HDFwear/Assets.xcassets/Setting/set_other.imageset/其他设置@2x.png
deleted file mode 100644
index bf8775f..0000000
--- a/HDFwear/Assets.xcassets/Setting/set_other.imageset/其他设置@2x.png
+++ /dev/null
diff --git a/HDFwear/Assets.xcassets/Setting/set_other.imageset/其他设置@3x.png b/HDFwear/Assets.xcassets/Setting/set_other.imageset/其他设置@3x.png
deleted file mode 100644
index b96a026..0000000
--- a/HDFwear/Assets.xcassets/Setting/set_other.imageset/其他设置@3x.png
+++ /dev/null
diff --git a/HDFwear/Assets.xcassets/Setting/set_reminder.imageset/Contents.json b/HDFwear/Assets.xcassets/Setting/set_reminder.imageset/Contents.json
index 938edcc..d8adb7a 100644
--- a/HDFwear/Assets.xcassets/Setting/set_reminder.imageset/Contents.json
+++ b/HDFwear/Assets.xcassets/Setting/set_reminder.imageset/Contents.json
@@ -5,12 +5,12 @@
"scale" : "1x"
},
{
- "filename" : "提醒功能@2x.png",
+ "filename" : "set_reminder@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
- "filename" : "提醒功能@3x.png",
+ "filename" : "set_reminder@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
diff --git a/HDFwear/Assets.xcassets/Setting/set_reminder.imageset/set_reminder@2x.png b/HDFwear/Assets.xcassets/Setting/set_reminder.imageset/set_reminder@2x.png
new file mode 100644
index 0000000..e1788a5
--- /dev/null
+++ b/HDFwear/Assets.xcassets/Setting/set_reminder.imageset/set_reminder@2x.png
diff --git a/HDFwear/Assets.xcassets/Setting/set_reminder.imageset/set_reminder@3x.png b/HDFwear/Assets.xcassets/Setting/set_reminder.imageset/set_reminder@3x.png
new file mode 100644
index 0000000..7a44394
--- /dev/null
+++ b/HDFwear/Assets.xcassets/Setting/set_reminder.imageset/set_reminder@3x.png
diff --git a/HDFwear/Assets.xcassets/Setting/set_reminder.imageset/提醒功能@2x.png b/HDFwear/Assets.xcassets/Setting/set_reminder.imageset/提醒功能@2x.png
deleted file mode 100644
index 77bf38d..0000000
--- a/HDFwear/Assets.xcassets/Setting/set_reminder.imageset/提醒功能@2x.png
+++ /dev/null
diff --git a/HDFwear/Assets.xcassets/Setting/set_reminder.imageset/提醒功能@3x.png b/HDFwear/Assets.xcassets/Setting/set_reminder.imageset/提醒功能@3x.png
deleted file mode 100644
index 8906722..0000000
--- a/HDFwear/Assets.xcassets/Setting/set_reminder.imageset/提醒功能@3x.png
+++ /dev/null
diff --git a/HDFwear/Motion/MotionViewController.swift b/HDFwear/Motion/MotionViewController.swift
index 8c1d20d..68a4a82 100644
--- a/HDFwear/Motion/MotionViewController.swift
+++ b/HDFwear/Motion/MotionViewController.swift
@@ -37,7 +37,7 @@ class MotionViewController: UIViewController {
override func viewWillAppear(_ animated: Bool) {
super.viewWillAppear(animated)
- self.navigationController?.setNavigationBarHidden(false, animated: true)
+ self.navigationController?.setNavigationBarHidden(true, animated: true)
user = UserInfo
getMotionHistory(selectedMode.rawValue)
diff --git a/HDFwear/Setting/Base.lproj/Setting.storyboard b/HDFwear/Setting/Base.lproj/Setting.storyboard
index ca8ee3d..cfcdbb5 100644
--- a/HDFwear/Setting/Base.lproj/Setting.storyboard
+++ b/HDFwear/Setting/Base.lproj/Setting.storyboard
@@ -30,10 +30,10 @@
-
+
-