[移动云相册] 遥控器中加入恢复出厂设置功能

app/src/main/java/com/sikey/interconnect/component/network/http/HttpService.kt

@@ -228,6 +228,9 @@ interface WatchSettingService : BaseHttpService {
 
     @GET(UrlConstants.remoteReboot)
     fun remoteReboot(@QueryMap paras: Map<String, String>): CustomFlowable<BaseResponse<NormalResponse>>
+
+    @GET(UrlConstants.restoreFactorySettings)
+    fun restoreFactorySettings(@QueryMap paras: Map<String, String>): CustomFlowable<BaseResponse<NormalResponse>>
 }
 
 interface SchoolModeService : BaseHttpService {

app/src/main/java/com/sikey/interconnect/constant/UrlConstants.kt

@@ -78,6 +78,7 @@ object UrlConstants {
 
     const val remoteShutdown = "api/v2/messagectx/messaging/publish/remote-control/shutdown"
     const val remoteReboot = "api/v2/messagectx/messaging/publish/remote-control/reboot"
+    const val restoreFactorySettings = "api/v2/messagectx/messaging/publish/remote-control/restoreFactorySettings"
 
     const val refreshLocation = "api/v2/locatectx/location/ask"
     const val historyLocation = "api/v2/locatectx/location/trajectory"

app/src/main/java/com/sikey/interconnect/k2/ui/settings/RemoteCtrlActivity.kt

@@ -54,6 +54,19 @@ class RemoteCtrlActivity : BaseNoActionBarActivity() {
         (findViewById<View>(R.id.lyt_remote_reboot) as RelativeLayout).apply {
             setOnClickListener { showAlertDialog(1) }
         }
+        (findViewById<View>(R.id.lyt_restore_factory_settings) as RelativeLayout).apply {
+            setOnClickListener { showRestoreFactorySettingsDialog() }
+        }
+    }
+
+    private fun showRestoreFactorySettingsDialog() {
+        Logger.d("showAlertDialog")
+        AlertDialog.Builder(this)
+            .setTitle(getString(R.string.restore_factory_settings))
+            .setMessage(getString(R.string.restore_factory_settings_query))
+            .setNegativeButton(R.string.protect_cancel_cancel) { dialog, _ -> dialog.dismiss() }
+            .setPositiveButton(R.string.alert_dialog_ok) { _, _ -> sendCmd(2) }
+            .show()
     }
 
     private fun showAlertDialog(type: Int) {
@@ -76,12 +89,21 @@ class RemoteCtrlActivity : BaseNoActionBarActivity() {
                         "cid" to cid
                     )
                 ).flowable
-            } else {
+            } else if (type == 1) {
                 (RetrofitFactory.retrofit(WatchSettingService::class.java) as WatchSettingService).remoteReboot(
                     mutableMapOf(
                         "cid" to cid
                     )
                 ).flowable
+            } else if (type == 2) {
+                (RetrofitFactory.retrofit(WatchSettingService::class.java) as WatchSettingService).restoreFactorySettings(
+                    mutableMapOf(
+                        "cid" to cid
+                    )
+                ).flowable
+            } else {
+                hideProgressDialog()
+                return@launch
             }
 
             HttpServiceExecutor.execute(

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

@@ -144,6 +144,32 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content" />
                 </RelativeLayout>
+
+                <RelativeLayout
+                    android:id="@+id/lyt_restore_factory_settings"
+                    android:background="@color/white"
+                    android:layout_width="match_parent"
+                    android:layout_marginTop="7dp"
+                    android:layout_height="@dimen/item_height"
+                    android:layout_below="@id/lyt_remote_reboot">
+
+                    <TextView
+                        android:layout_marginLeft="@dimen/base_input_margin_left"
+                        android:text="@string/restore_factory_settings"
+                        android:textSize="@dimen/text_size_large"
+                        android:textColor="@color/dark"
+                        android:layout_centerVertical="true"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content" />
+
+                    <ImageView
+                        android:src="@drawable/ic_next"
+                        android:layout_alignParentRight="true"
+                        android:layout_marginRight="@dimen/base_input_margin_left"
+                        android:layout_centerVertical="true"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content" />
+                </RelativeLayout>
             </RelativeLayout>
 
         </RelativeLayout>

app/src/main/res/values-zh-rCN/strings.xml

@@ -609,7 +609,8 @@
     <string name="version_check">系统升级</string>
     <string name="watch_factory_setting">出厂信息</string>
     <string name="reject_stranger">拒接陌生人</string>
-
+    <string name="restore_factory_settings">恢复出厂设置</string>
+    <string name="restore_factory_settings_query">您确定要让手表恢复出厂设置吗？</string>
 
     <!-- verify msg-->
     <string name="add_friend_sucess">添加成功!</string>

app/src/main/res/values/strings.xml

@@ -683,6 +683,8 @@
     <string name="version_check">System Update</string>
     <string name="watch_factory_setting">Watch Information</string>
     <string name="reject_stranger">White List Setting</string>
+    <string name="restore_factory_settings">Restore factory settings</string>
+    <string name="restore_factory_settings_query">Are you sure to restore factory settings?</string>
     <string name="add_friend_sucess">Add friend success</string>
     <string name="add_friend_fail">Add friend failed</string>
     <string name="start_time">Start time</string>