update default data

app/src/main/java/com/example/zxa01/iotclient/common/pojo/auth/LoginMessage.java

@@ -3,7 +3,9 @@ import android.support.annotation.NonNull;
 
 public class LoginMessage {
 
-    private String gateway;
+    private String address;
+    private String gatewayPort;
+    private String cloudPort;
     private String account;
     private String password;
 
@@ -11,19 +13,14 @@ public class LoginMessage {
 
     }
 
-    public LoginMessage(@NonNull String gateway, @NonNull String account, @NonNull String password) {
-        this.gateway = gateway;
+    public LoginMessage(@NonNull String address, @NonNull String gatewayPort,@NonNull String cloudPort, @NonNull String account, String password) {
+        this.address = address;
+        this.gatewayPort = gatewayPort;
+        this.cloudPort = cloudPort;
         this.account = account;
         this.password = password;
     }
 
-    public String getGateway() {
-        return gateway;
-    }
-
-    public void setGateway(String gateway) {
-        this.gateway = gateway;
-    }
 
     public String getAccount() {
         return account;
@@ -40,4 +37,36 @@ public class LoginMessage {
     public void setPassword(String password) {
         this.password = password;
     }
+
+    public String getAddress() {
+        return address;
+    }
+
+    public void setAddress(String address) {
+        this.address = address;
+    }
+
+    public String getGatewayPort() {
+        return gatewayPort;
+    }
+
+    public void setGatewayPort(String gatewayPort) {
+        this.gatewayPort = gatewayPort;
+    }
+
+    public String getCloudPort() {
+        return cloudPort;
+    }
+
+    public void setCloudPort(String cloudPort) {
+        this.cloudPort = cloudPort;
+    }
+
+    public String getGatewayServer(){
+        return address+":"+gatewayPort;
+    }
+
+    public String getCloudServer(){
+        return address+":"+cloudPort;
+    }
 }

app/src/main/java/com/example/zxa01/iotclient/common/singleton/Config.java

 package com.example.zxa01.iotclient.common.singleton;
 
-
 import com.example.zxa01.iotclient.common.pojo.Setting;
-import com.example.zxa01.iotclient.common.pojo.auth.User;
-
+import com.example.zxa01.iotclient.common.pojo.auth.LoginMessage;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -11,13 +9,12 @@ import java.util.stream.Collectors;
 public class Config {
 
     public static String USER = "使用者";
-    public static String GATEWAY = "閘道器位置";
+    public static String ADDRESS = "伺服器位置";
     public static String LOGOUT = "登出";
     public static String LOGOUT_MESSAGE = "登出本帳號";
     private static Config config = new Config();
-    private User user;
-    private String gateway;
     private List<Setting> settings;
+    private LoginMessage message;
 
     private Config() {
         this.reset();
@@ -28,25 +25,17 @@ public class Config {
     }
 
     public void reset() {
-        this.user = new User();
-        this.gateway = "";
         this.settings = new LinkedList<>();
+        this.message = new LoginMessage();
     }
 
-    public User getUser() {
-        return user;
-    }
-
-    public void setUser(User user) {
-        this.user = user;
-    }
 
-    public String getGateway() {
-        return gateway;
+    public LoginMessage getMessage() {
+        return message;
     }
 
-    public void setGateway(String gateway) {
-        this.gateway = gateway;
+    public void setMessage(LoginMessage message) {
+        this.message = message;
     }
 
     public List<Setting> getSettings() {
@@ -60,5 +49,4 @@ public class Config {
         this.settings.add(setting);
     }
 
-
 }

app/src/main/java/com/example/zxa01/iotclient/common/singleton/DefaultData.java

@@ -10,14 +10,12 @@ public class DefaultData {
     private static DefaultData defaultData = new DefaultData();
     private LoginMessage loginMessage;
     private List<String> devices = new LinkedList<>();
-    public String gatewayServer = "http://192.168.2.90:8080";
-    public String cloudServer = "http://192.168.2.90:8081";
-
+    public String address = "http://192.168.2.90";
+    public String gatewayPort= "8080";
+    public String cloudPort = "8081";
 
     private DefaultData() {
-        loginMessage = new LoginMessage(gatewayServer, "user", "1234");
-        devices.add("a1252c49-4188-4e6d-a32e-66604c664fb8");
-        devices.add("abe5ca7b-780e-4857-87e6-014870fe0a3e");
+        loginMessage = new LoginMessage(address,gatewayPort,cloudPort, "user", "1234");
     }
 
     public static DefaultData getDefaultData() {

app/src/main/java/com/example/zxa01/iotclient/common/tools/Api.java

@@ -4,7 +4,6 @@ import com.example.zxa01.iotclient.common.pojo.device.Device;
 import com.example.zxa01.iotclient.common.pojo.index.PrivacyChoiceResponse;
 import com.example.zxa01.iotclient.common.pojo.index.PrivacyPolicyReportResponse;
 import com.example.zxa01.iotclient.common.pojo.privacy.PrivacyChoice;
-import com.example.zxa01.iotclient.common.pojo.privacy.PrivacyPolicyReport;
 import com.example.zxa01.iotclient.common.singleton.Config;
 import com.google.gson.GsonBuilder;
 
@@ -27,7 +26,7 @@ public class Api {
 
     public static ApiInterface getApi() {
         retrofit = new Retrofit.Builder()
-                .baseUrl(Config.getConfig().getGateway())
+                .baseUrl(Config.getConfig().getMessage().getGatewayServer())
                 .client(new OkHttpClient.Builder()
                         .connectTimeout(10, TimeUnit.SECONDS)
                         .cache(null)
@@ -42,8 +41,7 @@ public class Api {
 
     public interface ApiInterface {
 
-        // 未使用
-        @POST("/api/breeds/list/all")
+        @GET("/")
         Call<Object> login();
 
         // 取得與該gateway所綁定的裝置列表

app/src/main/java/com/example/zxa01/iotclient/component/detail/DetailModel.java

@@ -31,7 +31,7 @@ public class DetailModel extends BaseObservable {
     }
 
     public void readDevice(@NonNull String udn) {
-        Api.getApi().readPrivacyPolicyReportByDevice(udn, Config.getConfig().getUser().getAccount()).enqueue(new Callback<PrivacyPolicyReportResponse>() {
+        Api.getApi().readPrivacyPolicyReportByDevice(udn, Config.getConfig().getMessage().getAccount()).enqueue(new Callback<PrivacyPolicyReportResponse>() {
             @Override
             public void onResponse(Call<PrivacyPolicyReportResponse> call, Response<PrivacyPolicyReportResponse> response) {
                 Log.i("readDevices - onResponse()", "success");

app/src/main/java/com/example/zxa01/iotclient/component/detail/DetailViewModel.java

@@ -2,7 +2,6 @@ package com.example.zxa01.iotclient.component.detail;
 
 import com.example.zxa01.iotclient.common.pojo.device.Device;
 import com.example.zxa01.iotclient.common.singleton.Config;
-import com.example.zxa01.iotclient.common.singleton.DefaultData;
 import com.example.zxa01.iotclient.common.tools.DownloadFile;
 import com.example.zxa01.iotclient.component.privacy.PrivacyActivity;
 import android.arch.lifecycle.MutableLiveData;
@@ -12,7 +11,6 @@ import android.content.Intent;
 import android.databinding.ObservableBoolean;
 import android.databinding.ObservableField;
 import android.support.annotation.NonNull;
-import android.widget.Toast;
 
 public class DetailViewModel extends ViewModel {
 
@@ -20,8 +18,6 @@ public class DetailViewModel extends ViewModel {
     public ObservableField<Device> device = new ObservableField<>();
     private DetailModel detailModel = new DetailModel();
     private Context context;
-    private Toast toast;
-
 
     public DetailViewModel(Context context) {
         this.context = context;
@@ -50,6 +46,6 @@ public class DetailViewModel extends ViewModel {
     }
 
     public void downloadPrivacyReport() {
-        new DownloadFile(context, DefaultData.getDefaultData().cloudServer+"/document/"+device.get().getUdn());
+        new DownloadFile(context, Config.getConfig().getMessage().getCloudServer()+"/document/"+device.get().getUdn());
     }
 }

app/src/main/java/com/example/zxa01/iotclient/component/home/device/bind/DeviceBindViewModel.java

@@ -4,15 +4,12 @@ import android.arch.lifecycle.MutableLiveData;
 import android.arch.lifecycle.ViewModel;
 import android.content.Context;
 import android.content.Intent;
-import android.databinding.ObservableBoolean;
 import android.databinding.ObservableField;
 import android.net.Uri;
-import android.support.annotation.NonNull;
 import android.support.v4.app.Fragment;
 import android.support.v7.app.AlertDialog;
 
 import com.example.zxa01.iotclient.R;
-import com.example.zxa01.iotclient.common.singleton.DefaultData;
 import com.example.zxa01.iotclient.component.home.HomeActivity;
 
 public class DeviceBindViewModel extends ViewModel {
@@ -37,8 +34,6 @@ public class DeviceBindViewModel extends ViewModel {
         this.fragment = fragment;
         this.context = fragment.getContext();
         drawDialog();
-        // default udn
-        udn.set(DefaultData.getDefaultData().getDevices().get(0));
     }
 
     /**

app/src/main/java/com/example/zxa01/iotclient/component/home/record/RecordModel.java

@@ -28,7 +28,7 @@ public class RecordModel extends BaseObservable {
     }
 
     public void fetchRecord() {
-        Api.getApi().readPrivacyChoiceRecordsByUser(Config.getConfig().getUser().getAccount()).enqueue(new Callback<List<PrivacyChoiceResponse>>() {
+        Api.getApi().readPrivacyChoiceRecordsByUser(Config.getConfig().getMessage().getAccount()).enqueue(new Callback<List<PrivacyChoiceResponse>>() {
             @Override
             public void onResponse(Call<List<PrivacyChoiceResponse>> call, @NonNull Response<List<PrivacyChoiceResponse>> response) {
                 Log.i("fetchRecord - onResponse()", "success");

app/src/main/java/com/example/zxa01/iotclient/component/login/LoginModel.java

@@ -3,6 +3,8 @@ import com.example.zxa01.iotclient.common.pojo.Setting;
 import com.example.zxa01.iotclient.common.pojo.auth.User;
 import com.example.zxa01.iotclient.common.singleton.Config;
 import com.example.zxa01.iotclient.common.pojo.auth.LoginMessage;
+import com.example.zxa01.iotclient.common.singleton.DefaultData;
+import com.example.zxa01.iotclient.component.home.device.DeviceFragment;
 
 import android.arch.lifecycle.MutableLiveData;
 import android.databinding.BaseObservable;
@@ -33,14 +35,19 @@ public class LoginModel extends BaseObservable {
     private boolean verification(@NonNull LoginMessage message) {
         return message.getAccount() != null &&
                 message.getPassword() != null &&
-                message.getGateway() != null;
+                message.getAddress() != null;
     }
 
     private void settingConfig(@NonNull LoginMessage message) {
-        Config.getConfig().setUser(new User().setAccount(message.getAccount()));
-        Config.getConfig().setGateway(message.getGateway());
-        Config.getConfig().addSetting(new Setting().setKey(Config.USER).setValue(Config.getConfig().getUser().getAccount()));
-        Config.getConfig().addSetting(new Setting().setKey(Config.GATEWAY).setValue(message.getGateway()));
+        Config.getConfig().setMessage(new LoginMessage(
+                message.getAddress(),
+                DefaultData.getDefaultData().gatewayPort,
+                DefaultData.getDefaultData().cloudPort,
+                message.getAccount(),
+                null
+        ));
+        Config.getConfig().addSetting(new Setting().setKey(Config.USER).setValue(Config.getConfig().getMessage().getAccount()));
+        Config.getConfig().addSetting(new Setting().setKey(Config.ADDRESS).setValue(Config.getConfig().getMessage().getAddress()));
         Config.getConfig().addSetting(new Setting().setKey(Config.LOGOUT).setValue(Config.LOGOUT_MESSAGE));
     }
 

app/src/main/java/com/example/zxa01/iotclient/component/login/LoginViewModel.java

@@ -17,6 +17,7 @@ public class LoginViewModel extends ViewModel {
 
     public LoginViewModel(Context context) {
         this.context = context;
+        // default
         loginMessage.set(DefaultData.getDefaultData().getLoginMessage());
     }
 

app/src/main/java/com/example/zxa01/iotclient/component/privacy/PrivacyModel.java

@@ -6,19 +6,14 @@ import android.os.Handler;
 import android.support.annotation.NonNull;
 import android.util.Log;
 
+import com.example.zxa01.iotclient.common.pojo.auth.User;
 import com.example.zxa01.iotclient.common.pojo.index.PrivacyPolicyReportResponse;
 import com.example.zxa01.iotclient.common.tools.Api;
 import com.example.zxa01.iotclient.common.pojo.index.PrivacyChoiceResponse;
 import com.example.zxa01.iotclient.common.pojo.privacy.PrivacyChoice;
 import com.example.zxa01.iotclient.common.pojo.privacy.PrivacyContent;
-import com.example.zxa01.iotclient.common.pojo.privacy.PrivacyPolicyReport;
 import com.example.zxa01.iotclient.common.singleton.Config;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
@@ -42,7 +37,7 @@ public class PrivacyModel extends BaseObservable {
     }
 
     public void readPrivacyPolicyReportByDevice(@NonNull String udn) {
-        Api.getApi().readPrivacyPolicyReportByDevice(udn,Config.getConfig().getUser().getAccount()).enqueue(new Callback<PrivacyPolicyReportResponse>() {
+        Api.getApi().readPrivacyPolicyReportByDevice(udn,Config.getConfig().getMessage().getAccount()).enqueue(new Callback<PrivacyPolicyReportResponse>() {
             @Override
             public void onResponse(Call<PrivacyPolicyReportResponse> call, Response<PrivacyPolicyReportResponse> response) {
                 privacyPolicyReportMLD.setValue(response.body());
@@ -59,7 +54,7 @@ public class PrivacyModel extends BaseObservable {
         isUploadMLD.setValue(true);
         Api.getApi().setPrivacyChoice(new PrivacyChoice()
                 .setPrivacyContent(
-                        privacyContent.setUser(Config.getConfig().getUser()))
+                        privacyContent.setUser(new User().setAccount(Config.getConfig().getMessage().getAccount())))
                 .setAccepted(isAccepted))
                 .enqueue(new Callback<PrivacyChoiceResponse>() {
                     @Override

app/src/main/java/com/example/zxa01/iotclient/component/privacy/PrivacyViewModel.java

 package com.example.zxa01.iotclient.component.privacy;
 
 import com.example.zxa01.iotclient.R;
+import com.example.zxa01.iotclient.common.pojo.auth.User;
 import com.example.zxa01.iotclient.common.pojo.index.PrivacyPolicyReportResponse;
 import com.example.zxa01.iotclient.common.pojo.privacy.PrivacyContent;
 import com.example.zxa01.iotclient.common.pojo.privacy.PrivacyPolicy;
@@ -80,7 +81,7 @@ public class PrivacyViewModel extends ViewModel {
                 privacyModel.getPrivacyPolicyReportMLD().getValue().getPolicies().size() > index) {
             privacyModel.setPrivacyChoice(
                     new PrivacyContent()
-                            .setUser(Config.getConfig().getUser())
+                            .setUser(new User().setAccount(Config.getConfig().getMessage().getAccount()))
                             .setDevice(privacyModel.getPrivacyPolicyReportMLD().getValue().getDevice())
                             .setPolicy(privacyModel.getPrivacyPolicyReportMLD().getValue().getPolicies().get(index)),
                     ((Switch) view).isChecked());

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

@@ -50,7 +50,7 @@
                         android:inputType="text"
                         android:maxLines="1"
                         android:singleLine="true"
-                        android:text="@={viewModel.loginMessage.gateway}" />
+                        android:text="@={viewModel.loginMessage.address}" />
 
                 </android.support.design.widget.TextInputLayout>
 

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

@@ -46,7 +46,7 @@
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
                 android:onClick="@{(view)->viewModel.onSetPrivacyChoice(position,view)}"
-                android:text="@string/privacy_content"
+                android:text="@{viewModel.getPrivacyResponseAt(position) ? @string/privacy_content : @string/privacy_reject}"
                 android:textAlignment="textEnd"
                 android:checked="@{viewModel.getPrivacyResponseAt(position)}"
                 android:thumbTextPadding="@dimen/padding_lg" />

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

@@ -34,7 +34,8 @@
     <string name="privacy_version">版本</string>
     <string name="privacy_request">我們會依照下列政策收集相關資料</string>
     <string name="privacy_title">隱私政策</string>
-    <string name="privacy_content">拒絕/同意</string>
+    <string name="privacy_content">同意</string>
+    <string name="privacy_reject">拒絕</string>
     <string name="privacy_loading_title">隱私選擇儲存中</string>
     <string name="privacy_loading_message">請稍後...</string>
     <string name="privacy_loading_error">儲存失敗，請重新嘗試</string>