Skip to content

Commit 4b1a88a

Browse files
matsujirushimatsujirushi
committed
Added Japan to server location
1 parent 1905a77 commit 4b1a88a

File tree

8 files changed

+69
-7
lines changed

8 files changed

+69
-7
lines changed

‎app/src/main/java/cc/seeed/iot/App.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,9 +85,7 @@ private void init() {
8585
ota_server_ip = sp.getString(Constant.SP_SERVER_IP, CommonUrl.OTA_INTERNATIONAL_IP);
8686
int firstStart = getSp().getInt(Constant.APP_FIRST_START, 0);
8787
if (firstStart == 0) {
88-
if (CommonUrl.OTA_INTERNATIONAL_URL.equals(ota_server_url) || CommonUrl.OTA_CHINA_URL.equals(ota_server_url)) {
89-
UserLogic.getInstance().logOut();
90-
}
88+
UserLogic.getInstance().logOut();
9189
getSp().edit().putInt(Constant.APP_FIRST_START, 1).commit();
9290
}
9391
IotApi.SetServerUrl(ota_server_url);

‎app/src/main/java/cc/seeed/iot/activity/SelectServerActivity.java‎

Lines changed: 34 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,10 @@ public class SelectServerActivity extends BaseActivity implements TextWatcher {
4949
RadioButton mRbChineseServer;
5050
@InjectView(R.id.mLlChineseServer)
5151
LinearLayout mLlChineseServer;
52+
@InjectView(R.id.mRbJapanServer)
53+
RadioButton mRbJapanServer;
54+
@InjectView(R.id.mLlJapanServer)
55+
LinearLayout mLlJapanServer;
5256
@InjectView(R.id.mRbCustomizeServer)
5357
RadioButton mRbCustomizeServer;
5458
@InjectView(R.id.mLlCustomizeServer)
@@ -89,16 +93,25 @@ private void initData() {
8993
if (CommonUrl.OTA_INTERNATIONAL_URL.equals(serverUrl)) {
9094
mRbGlobalServer.setChecked(true);
9195
mRbChineseServer.setChecked(false);
96+
mRbJapanServer.setChecked(false);
9297
mRbCustomizeServer.setChecked(false);
9398
mEtCustomServer.setEnabled(false);
9499
} else if (CommonUrl.OTA_CHINA_URL.equals(serverUrl)) {
95100
mRbGlobalServer.setChecked(false);
96101
mRbChineseServer.setChecked(true);
102+
mRbJapanServer.setChecked(false);
103+
mRbCustomizeServer.setChecked(false);
104+
mEtCustomServer.setEnabled(false);
105+
} else if (CommonUrl.OTA_JAPAN_URL.equals(serverUrl)) {
106+
mRbGlobalServer.setChecked(false);
107+
mRbChineseServer.setChecked(false);
108+
mRbJapanServer.setChecked(true);
97109
mRbCustomizeServer.setChecked(false);
98110
mEtCustomServer.setEnabled(false);
99111
} else {
100112
mRbGlobalServer.setChecked(false);
101113
mRbChineseServer.setChecked(false);
114+
mRbJapanServer.setChecked(false);
102115
mRbCustomizeServer.setChecked(true);
103116
mEtCustomServer.setEnabled(true);
104117
if (TextUtils.isEmpty(serverUrl)) {
@@ -110,14 +123,15 @@ private void initData() {
110123
}
111124
}
112125

113-
@OnClick({R.id.mLlGlobalServer, R.id.mLlChineseServer, R.id.mLlCustomizeServer, R.id.mLLSave,
114-
R.id.mRbGlobalServer, R.id.mRbChineseServer, R.id.mRbCustomizeServer})
126+
@OnClick({R.id.mLlGlobalServer, R.id.mLlChineseServer, R.id.mLlJapanServer, R.id.mLlCustomizeServer, R.id.mLLSave,
127+
R.id.mRbGlobalServer, R.id.mRbChineseServer, R.id.mRbJapanServer, R.id.mRbCustomizeServer})
115128
public void onClick(View view) {
116129
switch (view.getId()) {
117130
case R.id.mRbGlobalServer:
118131
case R.id.mLlGlobalServer:
119132
mRbGlobalServer.setChecked(true);
120133
mRbChineseServer.setChecked(false);
134+
mRbJapanServer.setChecked(false);
121135
mRbCustomizeServer.setChecked(false);
122136
mEtCustomServer.setEnabled(false);
123137
hideKeyboard(mEtCustomServer);
@@ -129,20 +143,34 @@ public void onClick(View view) {
129143
case R.id.mLlChineseServer:
130144
mRbGlobalServer.setChecked(false);
131145
mRbChineseServer.setChecked(true);
146+
mRbJapanServer.setChecked(false);
132147
mRbCustomizeServer.setChecked(false);
133148
mEtCustomServer.setEnabled(false);
134149
hideKeyboard(mEtCustomServer);
135150
changeServer = CommonUrl.OTA_CHINA_URL;
136151
isChangServer();
137152
saveIpAdress();
138153
break;
154+
case R.id.mRbJapanServer:
155+
case R.id.mLlJapanServer:
156+
mRbGlobalServer.setChecked(false);
157+
mRbChineseServer.setChecked(false);
158+
mRbJapanServer.setChecked(true);
159+
mRbCustomizeServer.setChecked(false);
160+
mEtCustomServer.setEnabled(false);
161+
hideKeyboard(mEtCustomServer);
162+
changeServer = CommonUrl.OTA_JAPAN_URL;
163+
isChangServer();
164+
saveIpAdress();
165+
break;
139166
case R.id.mRbCustomizeServer:
140167
case R.id.mLlCustomizeServer:
141-
if (CommonUrl.OTA_INTERNATIONAL_URL.equals(serverUrl) || CommonUrl.OTA_CHINA_URL.equals(serverUrl)) {
168+
if (CommonUrl.OTA_INTERNATIONAL_URL.equals(serverUrl) || CommonUrl.OTA_CHINA_URL.equals(serverUrl) || CommonUrl.OTA_JAPAN_URL.equals(serverUrl)) {
142169
mEtCustomServer.setText(App.getSp().getString(Constant.SP_HISTORY_IP, ""));
143170
}
144171
mRbGlobalServer.setChecked(false);
145172
mRbChineseServer.setChecked(false);
173+
mRbJapanServer.setChecked(false);
146174
mRbCustomizeServer.setChecked(true);
147175
mEtCustomServer.setEnabled(true);
148176
changeServer = mEtCustomServer.getText().toString().trim();
@@ -231,7 +259,9 @@ public void okCallback(String ip) {
231259
if (progressDialog != null) {
232260
progressDialog.dismiss();
233261
saveUrlAndIp(changeServer, ip);
234-
App.getSp().edit().putString(Constant.SP_HISTORY_IP, changeServer).commit();
262+
if (!CommonUrl.OTA_JAPAN_URL.equals(changeServer)) {
263+
App.getSp().edit().putString(Constant.SP_HISTORY_IP, changeServer).commit();
264+
}
235265
finish();
236266
}
237267
}

‎app/src/main/java/cc/seeed/iot/activity/user/LoginAndRegistActivity.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,8 @@ protected void onResume() {
160160
mTvSelectServer.setText(getString(R.string.server_global));
161161
} else if (CommonUrl.OTA_CHINA_URL.equals(serverUrl)) {
162162
mTvSelectServer.setText(getString(R.string.server_chinese));
163+
} else if (CommonUrl.OTA_JAPAN_URL.equals(serverUrl)) {
164+
mTvSelectServer.setText(getString(R.string.server_japan));
163165
} else {
164166
mTvSelectServer.setText(getString(R.string.server_customize));
165167
mLLOrtherLogin.setVisibility(View.GONE);

‎app/src/main/java/cc/seeed/iot/ui_main/MainSettingActivity.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,8 @@ private void initData(){
5656
mTvConnectServer.setText(getString(R.string.server_global));
5757
} else if (CommonUrl.OTA_CHINA_URL.equals(serverUrl)) {
5858
mTvConnectServer.setText(getString(R.string.server_chinese));
59+
} else if (CommonUrl.OTA_JAPAN_URL.equals(serverUrl)) {
60+
mTvConnectServer.setText(getString(R.string.server_japan));
5961
} else {
6062
mTvConnectServer.setText(getString(R.string.server_customize)+"\n"+serverUrl);
6163
}

‎app/src/main/java/cc/seeed/iot/util/CommonUrl.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ public class CommonUrl {
1010
public static String OTA_INTERNATIONAL_IP = "54.186.73.152";
1111
public static String OTA_CHINA_URL = "https://cn.wio.seeed.io";
1212
public static String OTA_CHINA_IP= "120.25.216.117";
13+
public static String OTA_JAPAN_URL = "https://wiolink.seeed.co.jp";
1314
public static String OTA_SERVER_URL = OTA_INTERNATIONAL_URL;
1415

1516

‎app/src/main/res/layout/activity_sel_server.xml‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,33 @@
114114
app:cusTextFont="@string/Proxima_Nova_Regular" />
115115
</LinearLayout>
116116

117+
<View
118+
android:layout_width="match_parent"
119+
android:layout_height="1dp"
120+
android:background="#E7E7E7" />
121+
122+
<LinearLayout
123+
android:id="@+id/mLlJapanServer"
124+
android:layout_width="match_parent"
125+
android:layout_height="53dp"
126+
android:gravity="center_vertical"
127+
android:orientation="horizontal">
128+
129+
<RadioButton
130+
android:id="@+id/mRbJapanServer"
131+
android:layout_width="wrap_content"
132+
android:layout_height="wrap_content" />
133+
134+
<cc.seeed.iot.view.FontTextView
135+
android:layout_width="wrap_content"
136+
android:layout_height="wrap_content"
137+
android:layout_marginLeft="15dp"
138+
android:text="@string/server_japan"
139+
android:textColor="#333333"
140+
android:textSize="16sp"
141+
app:cusTextFont="@string/Proxima_Nova_Regular" />
142+
</LinearLayout>
143+
117144
<View
118145
android:layout_width="match_parent"
119146
android:layout_height="1dp"

‎app/src/main/res/values-ja/strings.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
<!--Word-->
44
<string name="server_global">グローバル</string>
55
<string name="server_chinese">中国</string>
6+
<string name="server_japan">日本</string>
67
<string name="server_customize">カスタム</string>
78
<string name="registration">登録</string>
89
<string name="register">登録</string>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
<!--Word-->
1515
<string name="server_global">Global</string>
1616
<string name="server_chinese">Chinese</string>
17+
<string name="server_japan">Japan</string>
1718
<string name="server_customize">Customize</string>
1819
<string name="registration">Registration</string>
1920
<string name="register">Register</string>

0 commit comments

Comments
 (0)