From 2a4a9b0756d96166f4f5da6519a574bba1217776 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期四, 11 一月 2024 11:35:56 +0800
Subject: [PATCH] 2024年01月11日11:35:40
---
app/src/main/java/com/hdl/photovoltaic/utils/LocalManageUtil.java | 6 +-
app/src/main/java/com/hdl/photovoltaic/ui/bean/DeviceTimeBean.java | 12 +++--
app/src/main/java/com/hdl/photovoltaic/HDLApp.java | 59 +++++++----------------------
app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java | 11 ++++-
app/src/main/java/com/hdl/photovoltaic/ui/HomeLoginActivity.java | 2
app/src/main/java/com/hdl/photovoltaic/ui/me/WebActivity.java | 2
app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java | 5 ++
7 files changed, 38 insertions(+), 59 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/HDLApp.java b/app/src/main/java/com/hdl/photovoltaic/HDLApp.java
index 85f9657..350f879 100644
--- a/app/src/main/java/com/hdl/photovoltaic/HDLApp.java
+++ b/app/src/main/java/com/hdl/photovoltaic/HDLApp.java
@@ -83,7 +83,7 @@
//浠庡唴瀛橀噷闈㈣幏鍙栦笉鍒拌瑷�,鑾峰彇褰撳墠绯荤粺鐨�;
String str = getResources().getConfiguration().locale.getCountry();
if (str.equals("CN") || str.equals("TW")) {
- UserConfigManage.getInstance().setCurrentAppLanguage(LocalManageUtil.cn);
+ UserConfigManage.getInstance().setCurrentAppLanguage(LocalManageUtil.zh);
} else {
UserConfigManage.getInstance().setCurrentAppLanguage(LocalManageUtil.en);
}
@@ -163,13 +163,20 @@
HDLLinkPMSdk.initWithAppKey(getInstance(), AppConfigManage.getAppKey(), AppConfigManage.getAppSecret(), AppConfigManage.getAPPRegionUrl());
//2.璁剧疆鎵撳嵃
HDLLinkPMSdk.setLogEnabled(isLogEnabled);
- //3.閰嶇疆鎺ュ彛璇锋眰璇█
- Locale locale = LocalManageUtil.getSystemLocale(this);
- if (!locale.getLanguage().equals("zh")) {
- HDLLinkPMSdk.setLanguage("en");
- } else {
- HDLLinkPMSdk.setLanguage("cn");
+ if (TextUtils.isEmpty(UserConfigManage.getInstance().getCurrentAppLanguage())) {
+ //榛樿閰嶇疆鎺ュ彛璇锋眰璇█鏄腑鏂�
+ UserConfigManage.getInstance().setCurrentAppLanguage(LocalManageUtil.zh);
}
+ //3.閰嶇疆鎺ュ彛璇锋眰璇█
+ HDLLinkPMSdk.setLanguage(UserConfigManage.getInstance().getCurrentAppLanguage());
+
+// //3.閰嶇疆鎺ュ彛璇锋眰璇█
+// Locale locale = LocalManageUtil.getSystemLocale(this);
+// if (!locale.getLanguage().equals("zh")) {
+// HDLLinkPMSdk.setLanguage("en");
+// } else {
+// HDLLinkPMSdk.setLanguage("zh");
+// }
// HDLLinkPMSdk.setLanguage("en");//寮哄埗浣跨敤鑻辨枃
//4.鐩戝惉鐧诲嚭澶勭悊
HDLLinkPMUser.getInstance().setOnReloginListener(new IOnReloginListener() {
@@ -302,43 +309,5 @@
HdlLogLogic.print("娴嬭瘯Mqtt杩炴帴鏈嶅姟绔け璐�--->");
}
}
-
- public void appLocationInfo() {
- LocationManager locationManager = (LocationManager) getSystemService(Context.LOCATION_SERVICE);
- if (ActivityCompat.checkSelfPermission(this, android.Manifest.permission.ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED && ActivityCompat.checkSelfPermission(this, android.Manifest.permission.ACCESS_COARSE_LOCATION) != PackageManager.PERMISSION_GRANTED) {
- // TODO: Consider calling
- // ActivityCompat#requestPermissions
- // here to request the missing permissions, and then overriding
- // public void onRequestPermissionsResult(int requestCode, String[] permissions,
- // int[] grantResults)
- // to handle the case where the user grants the permission. See the documentation
- // for ActivityCompat#requestPermissions for more details.
- return;
- }
- //寮�濮嬪畾浣嶆湇鍔★紝minTimeMs鏈�灏忔椂闂撮棿闅旓紙鍗曚綅涓烘绉掞級,minDistanceM鏈�灏忚窛绂婚棿闅旓紙鍗曚綅涓虹背锛夈�佹渶灏忔椂闂撮棿闅旓紙鍗曚綅涓烘绉掞級绛夊弬鏁般��
- locationManager.requestLocationUpdates(LocationManager.GPS_PROVIDER, 1000, 1, new LocationListener() {
- @Override
- public void onLocationChanged(@NonNull Location location) {
- // 褰撲綅缃彂鐢熷彉鍖栨椂璋冪敤姝ゆ柟娉�
- double latitude = location.getLatitude(); // 鑾峰彇绾害
- double longitude = location.getLongitude(); // 鑾峰彇缁忓害
-
- HdlLogLogic.print("绾害--->" + latitude, true);
- HdlLogLogic.print("缁忓害--->" + longitude, true);
- // 杩欓噷鍙互鏍规嵁闇�姹傚鐞嗚幏鍙栧埌鐨勭粡绾害鏁版嵁
- }
-
- public void onStatusChanged(String provider, int status, Bundle extras) {
- }
-
- public void onProviderEnabled(String provider) {
- }
-
- public void onProviderDisabled(String provider) {
- }
-
- });
- }
-
}
diff --git a/app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java b/app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java
index 9946628..e32683e 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java
@@ -482,13 +482,16 @@
* @param mac 璁惧mac
* @param date 鏃ユ湡
* @param time 鏃堕棿
+ * @param timezone 鏃跺尯
* @param linkCallBack 鍥炶皟update
*/
- public void editGatewayTime(String mac, String date, String time, LinkCallBack<Boolean> linkCallBack) {
+ public void editGatewayTime(String mac, String date, String time, String timezone, LinkCallBack<Boolean> linkCallBack) {
String requestUrl = TopicApi.SET_GATEWAY_TIME_EDIT;
JsonObject json = new JsonObject();
json.addProperty("date", date);// "2020-08-15"
json.addProperty("time", time);//"17:25:20"
+ json.addProperty("timezone", timezone);//鏃跺尯(璇泙https://hdl-gz.yuque.com/wnkbmh/cdrglh/yckkyp#qWOPS)
+
TcpClient.getInstance().sendDataToLinkGateway(mac, requestUrl, json, "", new HDLLinkCallBack() {
@Override
public void onSuccess(String msg) {
diff --git a/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java b/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
index 967e18f..10ec0b1 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
@@ -395,13 +395,15 @@
//ACCESS_COARSE_LOCATION 鍏佽浣跨敤WIFI鐑偣鎴栧熀绔欐潵鑾峰彇绮楃暐鐨勫畾浣�
if (ActivityCompat.checkSelfPermission(HDLApp.getInstance(), Manifest.permission.ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED && ActivityCompat.checkSelfPermission(HDLApp.getInstance(), Manifest.permission.ACCESS_COARSE_LOCATION) != PackageManager.PERMISSION_GRANTED) {
jsonObject.addProperty("result", -2);//娌℃湁浣嶇疆淇℃伅鏉冮檺
+ jsonObject.addProperty("des", "娌℃湁浣嶇疆淇℃伅鏉冮檺");
uniCallbackData(jsonObject.toString(), callback);
return;
}
// 鍒ゆ柇璁惧鏄惁鏀寔瀹氫綅鍔熻兘
if (!locationManager.isProviderEnabled(LocationManager.GPS_PROVIDER)) {
- jsonObject.addProperty("result", -1);//涓嶆敮鎸佸畾浣嶅姛鑳�
+ jsonObject.addProperty("result", -1);//娌″紑鍚畾浣嶅姛鑳�
+ jsonObject.addProperty("des", "娌″紑鍚畾浣嶅姛鑳�");
//鎻愮ず鐢ㄦ埛鎵撳紑瀹氫綅鍔熻兘鎴栬�呭紩瀵肩敤鎴峰幓绯荤粺璁剧疆椤甸潰鎵撳紑瀹氫綅鍔熻兘
uniCallbackData(jsonObject.toString(), callback);
return;
@@ -409,10 +411,12 @@
Location location = locationManager.getLastKnownLocation(LocationManager.GPS_PROVIDER);
if (location == null) {
jsonObject.addProperty("result", -3);//娌℃湁浣嶇疆淇℃伅鏉冮檺
+ jsonObject.addProperty("des", "娌″紑鍚畾浣嶅姛鑳�");
uniCallbackData(jsonObject.toString(), callback);
return;
}
- jsonObject.addProperty("result", 0);//涓嶆敮鎸佸畾浣嶅姛鑳�
+ jsonObject.addProperty("result", 0);
+ jsonObject.addProperty("des", "鎴愬姛");
jsonObject.addProperty("longitude", location.getLongitude());//缁忓害
jsonObject.addProperty("latitude", location.getLatitude());//绾害
uniCallbackData(jsonObject.toString(), callback);
@@ -1064,7 +1068,8 @@
String mac = getKeyValue("mac", getKeyValue("data", data));
String date = getKeyValue("date", getKeyValue("data", data));
String time = getKeyValue("time", getKeyValue("data", data));
- HdlDeviceLogic.getInstance().editGatewayTime(mac, date, time, new LinkCallBack<Boolean>() {
+ String timezone = getKeyValue("timezone", getKeyValue("data", data));
+ HdlDeviceLogic.getInstance().editGatewayTime(mac, date, time, timezone, new LinkCallBack<Boolean>() {
@Override
public void onSuccess(Boolean obj) {
uniCallbackData(true, callback);
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/HomeLoginActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/HomeLoginActivity.java
index 16ee961..6bff9c1 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/HomeLoginActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/HomeLoginActivity.java
@@ -107,7 +107,7 @@
viewBinding.homeLoginInstallUserTv.setSelected(UserConfigManage.getInstance().isBAccount());
viewBinding.homeLoginPrivacyCheckIv.setSelected(UserConfigManage.getInstance().isAcceiptPolicy());
setStringDifferentColors(viewBinding.homeLoginPrivacyTv);
- if (UserConfigManage.getInstance().getCurrentAppLanguage().equals(LocalManageUtil.cn)) {
+ if (UserConfigManage.getInstance().getCurrentAppLanguage().equals(LocalManageUtil.zh)) {
viewBinding.homeLoginLanguageTv.setText("绠�浣撲腑鏂�");
} else {
viewBinding.homeLoginLanguageTv.setText("English");
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/bean/DeviceTimeBean.java b/app/src/main/java/com/hdl/photovoltaic/ui/bean/DeviceTimeBean.java
index cd38c44..4ce0cd6 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/bean/DeviceTimeBean.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/bean/DeviceTimeBean.java
@@ -16,7 +16,9 @@
private String noon;//姝ｅ崍鏃堕棿
private String broadcast_time;//骞挎挱鏃堕棿闂撮殧
private String localtimestamp;//鏈湴鏃堕棿鏃堕棿鎴�
- private String zone;//鏃跺尯
+
+
+ private String timezone;//鏃跺尯
private DstBean dst;
public String getDate() {
@@ -91,12 +93,12 @@
this.localtimestamp = localtimestamp;
}
- public String getZone() {
- return zone == null ? "" : zone;
+ public String getTimezone() {
+ return timezone == null ? "" : timezone;
}
- public void setZone(String zone) {
- this.zone = zone;
+ public void setTimezone(String timezone) {
+ this.timezone = timezone;
}
public DstBean getDst() {
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/me/WebActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/me/WebActivity.java
index a99b756..d4f11f8 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/me/WebActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/me/WebActivity.java
@@ -64,7 +64,7 @@
viewBinding.toolbarTopFragmentHouseListRl.topBackBtn.setVisibility(View.VISIBLE);
viewBinding.toolbarTopFragmentHouseListRl.topBarView.setBackgroundColor(getResources().getColor(R.color.text_FFFFFFFF, null));
- if (UserConfigManage.getInstance().getCurrentAppLanguage().equals(LocalManageUtil.cn)) {
+ if (UserConfigManage.getInstance().getCurrentAppLanguage().equals(LocalManageUtil.zh)) {
//涓枃
if (this.typeIntValue == 0) {
//鐢ㄦ埛鍗忚
diff --git a/app/src/main/java/com/hdl/photovoltaic/utils/LocalManageUtil.java b/app/src/main/java/com/hdl/photovoltaic/utils/LocalManageUtil.java
index a10459d..69574b5 100644
--- a/app/src/main/java/com/hdl/photovoltaic/utils/LocalManageUtil.java
+++ b/app/src/main/java/com/hdl/photovoltaic/utils/LocalManageUtil.java
@@ -28,7 +28,7 @@
*/
public class LocalManageUtil {
- public static final String cn = "cn";//涓枃
+ public static final String zh = "zh";//涓枃浣�
public static final String en = "en";//鑻辨枃
// private static Locale mLocale;
@@ -140,7 +140,7 @@
LanguageAdapter.ItemData zh = new LanguageAdapter.ItemData();
zh.setState(false);
zh.setTitle("绠�浣撲腑鏂�");
- zh.setLanguage(LocalManageUtil.cn);
+ zh.setLanguage(LocalManageUtil.zh);
list.add(zh);
LanguageAdapter.ItemData en = new LanguageAdapter.ItemData();
en.setState(false);
@@ -189,7 +189,7 @@
// Locale locale = context.getResources().getConfiguration().locale;
// String language = locale.getLanguage();
String language = UserConfigManage.getInstance().getCurrentAppLanguage();
- return language.equals(cn);
+ return language.equals(zh);
}
public static List<NationBean> getNationBeans() {
--
Gitblit v1.8.0