From 2744dfb7867000f044c60fe4ee9103ad51532b9b Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期三, 10 一月 2024 18:12:39 +0800
Subject: [PATCH] 2024年01月10日18:12:32
---
app/src/main/java/com/hdl/photovoltaic/utils/LocalManageUtil.java | 6
app/src/main/java/com/hdl/photovoltaic/uni/HDLUniMP.java | 1
app/src/main/res/values/strings.xml | 1
app/src/main/java/com/hdl/photovoltaic/HDLApp.java | 51 ++++++++++
app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java | 73 ++++++++++++-
app/src/main/java/com/hdl/photovoltaic/ui/me/WebActivity.java | 2
app/src/main/java/com/hdl/photovoltaic/uni/HDLUniMPSDKManager.java | 8
app/src/main/res/values-zh/strings.xml | 1
app/src/main/java/com/hdl/photovoltaic/other/HdlJpushLogic.java | 2
app/src/main/java/com/hdl/photovoltaic/utils/PermissionUtils.java | 2
app/src/main/res/values-en/strings.xml | 1
app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java | 108 +++++++++++++++++----
app/src/main/java/com/hdl/photovoltaic/ui/test/TestLogActivity.java | 2
app/src/main/java/com/hdl/photovoltaic/ui/HomeLoginActivity.java | 2
14 files changed, 216 insertions(+), 44 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/HDLApp.java b/app/src/main/java/com/hdl/photovoltaic/HDLApp.java
index 5bcb757..85f9657 100644
--- a/app/src/main/java/com/hdl/photovoltaic/HDLApp.java
+++ b/app/src/main/java/com/hdl/photovoltaic/HDLApp.java
@@ -1,9 +1,18 @@
package com.hdl.photovoltaic;
import android.app.Application;
+import android.content.Context;
import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.location.Location;
+import android.location.LocationListener;
+import android.location.LocationManager;
+import android.os.Bundle;
import android.text.TextUtils;
+
+import androidx.annotation.NonNull;
+import androidx.core.app.ActivityCompat;
import com.hdl.hdlhttp.HxHttpConfig;
import com.hdl.linkpm.sdk.HDLLinkPMSdk;
@@ -15,6 +24,7 @@
import com.hdl.photovoltaic.config.UserConfigManage;
import com.hdl.photovoltaic.enums.NetworkType;
import com.hdl.photovoltaic.other.HdlLogLogic;
+import com.hdl.photovoltaic.other.HdlOtaLogic;
import com.hdl.photovoltaic.other.HdlThreadLogic;
import com.hdl.photovoltaic.ui.HomeLoginActivity;
import com.hdl.photovoltaic.uni.HDLUniMPSDKManager;
@@ -63,6 +73,8 @@
SharedPreUtils.init(this);
getAppLanguage();
initThirdSDK();
+// appLocationInfo();
+
}
public void getAppLanguage() {
@@ -71,7 +83,7 @@
//浠庡唴瀛橀噷闈㈣幏鍙栦笉鍒拌瑷�,鑾峰彇褰撳墠绯荤粺鐨�;
String str = getResources().getConfiguration().locale.getCountry();
if (str.equals("CN") || str.equals("TW")) {
- UserConfigManage.getInstance().setCurrentAppLanguage(LocalManageUtil.zh);
+ UserConfigManage.getInstance().setCurrentAppLanguage(LocalManageUtil.cn);
} else {
UserConfigManage.getInstance().setCurrentAppLanguage(LocalManageUtil.en);
}
@@ -291,5 +303,42 @@
}
}
+ 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/HdlJpushLogic.java b/app/src/main/java/com/hdl/photovoltaic/other/HdlJpushLogic.java
index 897176d..73c71d0 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlJpushLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlJpushLogic.java
@@ -46,7 +46,7 @@
* @param isOpened true=鐐瑰嚮閫氱煡鏍忓洖璋�,false=鏀跺埌鎺ㄩ�侀�氱煡鍥炶皟;
*/
public void JpushPushCommonData(Context context, JPushMessageInfoBean jPushMessageInfoBean, boolean isOpened) {
- //娣诲姞鍦ㄦ帹閫佹暟鎹埌缂撳瓨鍒楄〃涓�;
+ //娣诲姞鎺ㄩ�佹暟鎹埌缂撳瓨鍒楄〃涓�;
this.addPushDataToMemoryList(jPushMessageInfoBean);
if (isOpened) {
Intent intent = new Intent(context, MyPowerStationActivity.class);
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 c425f7c..967e18f 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
@@ -1,13 +1,25 @@
package com.hdl.photovoltaic.other;
+import android.Manifest;
import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
import android.content.ServiceConnection;
+import android.content.pm.PackageManager;
+import android.location.Location;
+import android.location.LocationListener;
+import android.location.LocationManager;
import android.os.IBinder;
+import android.provider.Settings;
import android.text.TextUtils;
import android.util.Log;
+import androidx.annotation.NonNull;
+import androidx.core.app.ActivityCompat;
+
import com.google.gson.Gson;
+import com.google.gson.JsonObject;
import com.hdl.linkpm.sdk.core.exception.HDLException;
import com.hdl.linkpm.sdk.device.bean.DeviceOidInfoBean;
import com.hdl.linkpm.sdk.ota.bean.CloudDeviceFirmwaresBean;
@@ -30,6 +42,7 @@
import com.hdl.photovoltaic.uni.HDLUniMPSDKManager;
import com.hdl.photovoltaic.utils.NetworkUtils;
import com.hdl.photovoltaic.utils.WifiUtils;
+import com.hdl.photovoltaic.widget.ConfirmationCancelDialog;
import com.hdl.sdk.link.common.exception.HDLLinkCode;
import com.hdl.sdk.link.common.exception.HDLLinkException;
import com.hdl.sdk.link.core.bean.eventbus.BaseEventBus;
@@ -318,6 +331,10 @@
uniCallbackData(UserConfigManage.getInstance().getCurrentAppLanguage(), callback);
}
break;
+ //鑾峰彇浣嶇疆淇℃伅
+ case HDLUniMP.UNI_EVENT_REPLY_OTHER_LOCATION_INFO: {
+ this.uniGetLocationInfo(data, callback);
+ }
}
}
HdlLogLogic.print("uni鍙戞潵鐨勬暟鎹�--->澶х被--->" + topic + "\r\n" + data, true);
@@ -364,6 +381,44 @@
//endregion
//region ******uni鎺ュ彛鏂规硶******
+
+ /**
+ * 鑾峰彇浣嶇疆淇℃伅,鍖呮嫭缁忕含搴�
+ */
+ private void uniGetLocationInfo(Object data, DCUniMPJSCallback callback) {
+
+ // 鍒濆鍖朙ocationManager瀵硅薄
+ LocationManager locationManager = (LocationManager) HDLApp.getInstance().getSystemService(Context.LOCATION_SERVICE);
+ JsonObject jsonObject = new JsonObject();
+ //INTERNET 鍏佽浣跨敤缃戠粶
+ //ACCESS_FINE_LOCATION 鍏佽浣跨敤GPS瀹氫綅
+ //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);//娌℃湁浣嶇疆淇℃伅鏉冮檺
+ uniCallbackData(jsonObject.toString(), callback);
+ return;
+ }
+
+ // 鍒ゆ柇璁惧鏄惁鏀寔瀹氫綅鍔熻兘
+ if (!locationManager.isProviderEnabled(LocationManager.GPS_PROVIDER)) {
+ jsonObject.addProperty("result", -1);//涓嶆敮鎸佸畾浣嶅姛鑳�
+ //鎻愮ず鐢ㄦ埛鎵撳紑瀹氫綅鍔熻兘鎴栬�呭紩瀵肩敤鎴峰幓绯荤粺璁剧疆椤甸潰鎵撳紑瀹氫綅鍔熻兘
+ uniCallbackData(jsonObject.toString(), callback);
+ return;
+ }
+ Location location = locationManager.getLastKnownLocation(LocationManager.GPS_PROVIDER);
+ if (location == null) {
+ jsonObject.addProperty("result", -3);//娌℃湁浣嶇疆淇℃伅鏉冮檺
+ uniCallbackData(jsonObject.toString(), callback);
+ return;
+ }
+ jsonObject.addProperty("result", 0);//涓嶆敮鎸佸畾浣嶅姛鑳�
+ jsonObject.addProperty("longitude", location.getLongitude());//缁忓害
+ jsonObject.addProperty("latitude", location.getLatitude());//绾害
+ uniCallbackData(jsonObject.toString(), callback);
+ HdlLogLogic.print("缁忕含搴�--->缁忓害:" + location.getLongitude() + "绾害:" + location.getLatitude(), true);
+
+ }
/**
* 鍚戜簯绔幏鍙栭�嗗彉鍣╫id鍒楄〃
@@ -429,9 +484,9 @@
*/
private void uniGetLocalFirmwares(Object data, DCUniMPJSCallback callback) {
try {
- String hardwareModel = getKeyValue("hardwareModel", getKeyValue("data", data));//纭欢鍨嬪彿
+// String hardwareModel = getKeyValue("hardwareModel", getKeyValue("data", data));//纭欢鍨嬪彿
String osImageId = getKeyValue("osImageId", getKeyValue("data", data));//绯荤粺闀滃儚id
- String firmwareVersionId = getKeyValue("firmwareVersionId", getKeyValue("data", data));//鍥轰欢鐗堟湰id
+// String firmwareVersionId = getKeyValue("firmwareVersionId", getKeyValue("data", data));//鍥轰欢鐗堟湰id
// String oid = getKeyValue("oid", getKeyValue("data", data));//鍥轰欢oid
List<DeviceFirmwareBean> list = new ArrayList<>();
String driverFileList = HdlFileLogic.getInstance().getFirmwareRootPath();
@@ -463,7 +518,7 @@
* 鍚戜簯绔彂璧枫�愯澶囧浐浠朵笅杞姐�戞寚浠�
*/
private void uniDeviceFirmwareDownload(Object data, DCUniMPJSCallback callback) {
- String deviceOidId = getKeyValue("deviceOidId", getKeyValue("data", data));//浜戠涓婅澶噄d
+// String deviceOidId = getKeyValue("deviceOidId", getKeyValue("data", data));//浜戠涓婅澶噄d
String oid = getKeyValue("oid", getKeyValue("data", data));//璇ュ浐浠剁殑oid
String imageId = getKeyValue("imageId", getKeyValue("data", data));//鍥轰欢闀滃儚id
String version = getKeyValue("version", getKeyValue("data", data));//鍥轰欢鐗堟湰
@@ -515,7 +570,7 @@
String oid = getKeyValue("oid", getKeyValue("data", data));//鍗囩骇鍥轰欢鐨刼id
String firmwareVersionId = getKeyValue("firmwareVersionId", getKeyValue("data", data));//鍥轰欢鐗堟湰id
String version = getKeyValue("version", getKeyValue("data", data));//鍥轰欢鐗堟湰
- String hardwareModel = getKeyValue("hardwareModel", getKeyValue("data", data));//浜戠涓婃枃浠禡D5
+// String hardwareModel = getKeyValue("hardwareModel", getKeyValue("data", data));//浜戠涓婃枃浠禡D5
String imageId = getKeyValue("imageId", getKeyValue("data", data));//鍥轰欢闀滃儚id
String module = "FW#" + imageId;//妯″潡淇℃伅(HW锛氱‖浠�)
@@ -686,8 +741,8 @@
private void uniGetLocalDrivers(Object data, DCUniMPJSCallback callback) {
try {
String driveCode = getKeyValue("driveCode", getKeyValue("data", data));//椹卞姩缂栧彿鎴栭┍鍔ㄥ悕绉�
- String osImageId = getKeyValue("osImageId", getKeyValue("data", data));//椹卞姩绫诲瀷id
- String driverVersionId = getKeyValue("driverVersionId", getKeyValue("data", data));//椹卞姩绫诲瀷id
+// String osImageId = getKeyValue("osImageId", getKeyValue("data", data));//椹卞姩绫诲瀷id
+// String driverVersionId = getKeyValue("driverVersionId", getKeyValue("data", data));//椹卞姩绫诲瀷id
List<GatewayDriverBean> list = new ArrayList<>();
String driverFileList = HdlFileLogic.getInstance().getDriveRootPath();
File file = new File(driverFileList);
@@ -719,11 +774,11 @@
*/
private void uniGatewayDriverDownload(Object data, DCUniMPJSCallback callback) {
- String deviceOid = getKeyValue("oid", getKeyValue("data", data));//閫嗗彉鍣ㄨ澶噊id
+// String deviceOid = getKeyValue("oid", getKeyValue("data", data));//閫嗗彉鍣ㄨ澶噊id
String driverCode = getKeyValue("driverCode", getKeyValue("data", data));//椹卞姩缂栫爜
- String imageId = getKeyValue("imageId", getKeyValue("data", data));//椹卞姩闀滃儚id
+// String imageId = getKeyValue("imageId", getKeyValue("data", data));//椹卞姩闀滃儚id
String version = getKeyValue("version", getKeyValue("data", data));//椹卞姩鐗堟湰
- String driverVersionId = getKeyValue("driverVersionId", getKeyValue("data", data));//椹卞姩鐗堟湰id
+// String driverVersionId = getKeyValue("driverVersionId", getKeyValue("data", data));//椹卞姩鐗堟湰id
String localUrl = getKeyValue("localUrl", getKeyValue("data", data));//鍌ㄥ瓨鍦ㄦ湰鍦伴┍鍔ㄦ枃浠惰矾寰�
String url = getKeyValue("url", getKeyValue("data", data));//浜戠涓婃枃浠跺湴鍧�
String md5 = getKeyValue("md5", getKeyValue("data", data));//浜戠涓婃枃浠禡D5
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 6bff9c1..16ee961 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.zh)) {
+ if (UserConfigManage.getInstance().getCurrentAppLanguage().equals(LocalManageUtil.cn)) {
viewBinding.homeLoginLanguageTv.setText("绠�浣撲腑鏂�");
} else {
viewBinding.homeLoginLanguageTv.setText("English");
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java
index 9e76eff..9f53d29 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java
@@ -2,14 +2,22 @@
import androidx.annotation.NonNull;
import androidx.appcompat.content.res.AppCompatResources;
+import androidx.core.app.ActivityCompat;
import android.Manifest;
+import android.content.Context;
import android.content.Intent;
import android.content.IntentFilter;
import android.content.pm.PackageManager;
+import android.location.Location;
+import android.location.LocationListener;
+import android.location.LocationManager;
+import android.net.Uri;
import android.os.Bundle;
import android.os.Process;
import android.os.SystemClock;
+import android.provider.ContactsContract;
+import android.provider.Settings;
import android.text.TextUtils;
import android.view.View;
@@ -94,6 +102,8 @@
this.clickJpushNotificationMessage();
//閫氱煡闄愭潈
this.notificationSet();
+ //鍒濆鍖栨潈闄�
+ requestPermissions();
}
@@ -276,13 +286,12 @@
}
public void requestPermissions() {
- String[] ary = PermissionUtils.checkPermission(_mActivity, new String[]{Manifest.permission.ACCESS_FINE_LOCATION});
+ //Manifest.permission.ACCESS_COARSE_LOCATION
+ String[] ary = PermissionUtils.checkPermission(_mActivity, new String[]{Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.ACCESS_COARSE_LOCATION});
if (ary.length > 0) {
- requestPermissions(ary, PermissionUtils.STATUS_SUCCESS);
+ this.requestPermissions(ary, PermissionUtils.STATUS_SUCCESS);
} else {
- if (mPermissionsResultCallback != null) {
- mPermissionsResultCallback.succeed();
- }
+ locationUpdates();
}
}
@@ -292,28 +301,17 @@
if (requestCode == PermissionUtils.STATUS_SUCCESS) {
for (int i = 0; i < permissions.length; i++) {
if (grantResults[i] == PackageManager.PERMISSION_GRANTED) {
- if (mPermissionsResultCallback != null) {
- mPermissionsResultCallback.succeed();
+ switch (permissions[i]) {
+ case Manifest.permission.ACCESS_FINE_LOCATION: {
+ locationUpdates();
+ }
+ break;
}
+
}
}
}
-
- }
-
-
- private PermissionsResultCallback mPermissionsResultCallback;
-
- public void setPermissionsResultCallback(PermissionsResultCallback permissionsResultCallback) {
- mPermissionsResultCallback = permissionsResultCallback;
- }
-
- public interface PermissionsResultCallback {
-
- void succeed();
-
- void failing();
}
@@ -523,4 +521,70 @@
}
+ /**
+ * 鍒濆鍖栥�愬紑鍚畾浣嶃�戝拰銆愪綅缃俊鎭�戞潈闄�
+ */
+ private void locationUpdates() {
+ // 鍒濆鍖朙ocationManager瀵硅薄
+ LocationManager locationManager = (LocationManager) getSystemService(Context.LOCATION_SERVICE);
+ // 鍒ゆ柇璁惧鏄惁鏀寔瀹氫綅鍔熻兘
+ if (!locationManager.isProviderEnabled(LocationManager.GPS_PROVIDER)) {
+ // 鎻愮ず鐢ㄦ埛鎵撳紑瀹氫綅鍔熻兘鎴栬�呭紩瀵肩敤鎴峰幓绯荤粺璁剧疆椤甸潰鎵撳紑瀹氫綅鍔熻兘
+ ConfirmationCancelDialog confirmationCancelDialog = new ConfirmationCancelDialog(_mActivity);
+ confirmationCancelDialog.setTitle(getString(R.string.loading_title_tip));
+ confirmationCancelDialog.setContent(getString(R.string.system_positioning_switch));
+ confirmationCancelDialog.setConfirmation(getString(R.string.go_to_settings));
+ confirmationCancelDialog.show();
+ confirmationCancelDialog.setYesOnclickListener(new ConfirmationCancelDialog.onYesOnclickListener() {
+ @Override
+ public void Confirm() {
+ confirmationCancelDialog.dismiss();
+ Intent intent = new Intent(Settings.ACTION_LOCATION_SOURCE_SETTINGS);
+ intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+ HDLApp.getInstance().startActivity(intent);
+
+ }
+ });
+ confirmationCancelDialog.setNoOnclickListener(new ConfirmationCancelDialog.onNoOnclickListener() {
+ @Override
+ public void Cancel() {
+ confirmationCancelDialog.dismiss();
+ }
+ });
+
+ } else {
+// //INTERNET 鍏佽浣跨敤缃戠粶
+// //ACCESS_FINE_LOCATION 鍏佽浣跨敤GPS瀹氫綅
+// //ACCESS_COARSE_LOCATION 鍏佽浣跨敤WIFI鐑偣鎴栧熀绔欐潵鑾峰彇绮楃暐鐨勫畾浣�
+// if (ActivityCompat.checkSelfPermission(_mActivity, Manifest.permission.ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED && ActivityCompat.checkSelfPermission(this, 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;
+// }
+// HdlLogLogic.print("寮�濮嬬含搴︾粡搴�--->", true);
+// Location location = locationManager.getLastKnownLocation(LocationManager.GPS_PROVIDER);
+//
+// //寤鸿杩欎釜 minTime 涓嶅皬浜� 60000锛屽嵆 1 鍒嗛挓锛岃繖鏍蜂細鏇村姞楂樻晥鑰屼笖鐪佺數
+// locationManager.requestLocationUpdates(LocationManager.GPS_PROVIDER, 0, 0, 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);
+// }
+// });
+ }
+
+
+ }
+
+
}
\ No newline at end of file
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 d4f11f8..a99b756 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.zh)) {
+ if (UserConfigManage.getInstance().getCurrentAppLanguage().equals(LocalManageUtil.cn)) {
//涓枃
if (this.typeIntValue == 0) {
//鐢ㄦ埛鍗忚
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/test/TestLogActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/test/TestLogActivity.java
index 9deeb11..81f8933 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/test/TestLogActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/test/TestLogActivity.java
@@ -148,7 +148,7 @@
HdlThreadLogic.runSubThread(new Runnable() {
@Override
public void run() {
- HdlFileLogic.getInstance().delFileLien(HdlFileLogic.getInstance().getLogFileNamePath(), 2);
+// HdlFileLogic.getInstance().delFileLien(HdlFileLogic.getInstance().getLogFileNamePath(), 2);
String content = HdlLogLogic.readLog();
HdlThreadLogic.runMainThread(new Runnable() {
@Override
diff --git a/app/src/main/java/com/hdl/photovoltaic/uni/HDLUniMP.java b/app/src/main/java/com/hdl/photovoltaic/uni/HDLUniMP.java
index 4cd5037..32bcbaa 100644
--- a/app/src/main/java/com/hdl/photovoltaic/uni/HDLUniMP.java
+++ b/app/src/main/java/com/hdl/photovoltaic/uni/HDLUniMP.java
@@ -60,6 +60,7 @@
public final static String UNI_EVENT_REPLY_OTHER_MODEL = "uni_other_model";//鍏跺畠妯″潡(澶х被)
public final static String UNI_EVENT_REPLY_OTHER_UNIT = "temperature_unit";//鑾峰彇娓╁害鍗曚綅
public final static String UNI_EVENT_REPLY_OTHER_APP_LANGUAGE = "app_language";//鑾峰彇app璇█
+ public final static String UNI_EVENT_REPLY_OTHER_LOCATION_INFO = "location_info";//鑾峰彇app浣嶇疆淇℃伅
/*********Wifi妯″潡*********/ //鍗敠瀹氫箟
diff --git a/app/src/main/java/com/hdl/photovoltaic/uni/HDLUniMPSDKManager.java b/app/src/main/java/com/hdl/photovoltaic/uni/HDLUniMPSDKManager.java
index 451def7..8f214c8 100644
--- a/app/src/main/java/com/hdl/photovoltaic/uni/HDLUniMPSDKManager.java
+++ b/app/src/main/java/com/hdl/photovoltaic/uni/HDLUniMPSDKManager.java
@@ -344,15 +344,15 @@
* 娉ㄦ剰锛氶渶瑕佹彁鍓嶅皬绋嬪簭鍦ㄨ繍琛屾墠鍙垚鍔�
*
* @param uniAppId 灏忕▼搴忔寚瀹�
- * @param event 灏忕▼搴忔寚瀹氫富棰�
+ * @param topic 灏忕▼搴忔寚瀹氫富棰�
* @param data String鎴朖SON
*/
- public void sendUniMPEvent(String uniAppId, String event, Object data) {
+ public void sendUniMPEvent(String uniAppId, String topic, Object data) {
if (mUniMPCaches.containsKey(uniAppId)) {
if (mUniMPCaches.get(uniAppId) != null) {
- mUniMPCaches.get(uniAppId).sendUniMPEvent(event, data);
- HdlLogLogic.print("鍙戦�侀�氱煡鎴愬姛锛歟vent锛�" + event + " data锛�" + new Gson().toJson(data));
+ mUniMPCaches.get(uniAppId).sendUniMPEvent(topic, data);
+ HdlLogLogic.print("鍙戦�侀�氱煡鎴愬姛锛歟vent锛�" + topic + " data锛�" + new Gson().toJson(data));
} else {
HdlLogLogic.print("鍙戦�佸け璐ワ紝灏忕▼搴忓璞′负绌猴細" + uniAppId);
}
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 c48b8b0..a10459d 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 zh = "zh";//涓枃
+ public static final String cn = "cn";//涓枃
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.zh);
+ zh.setLanguage(LocalManageUtil.cn);
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(zh);
+ return language.equals(cn);
}
public static List<NationBean> getNationBeans() {
diff --git a/app/src/main/java/com/hdl/photovoltaic/utils/PermissionUtils.java b/app/src/main/java/com/hdl/photovoltaic/utils/PermissionUtils.java
index cbc69e5..2aa33c7 100644
--- a/app/src/main/java/com/hdl/photovoltaic/utils/PermissionUtils.java
+++ b/app/src/main/java/com/hdl/photovoltaic/utils/PermissionUtils.java
@@ -48,7 +48,7 @@
* @param activity -
* @param strings -
*/
- public static void askPermission(Activity activity, String[] strings) {
+ public static void activityPermission(Activity activity, String[] strings) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
List<String> newList = new ArrayList<>();
for (String permission : strings) {
diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml
index f4e466c..7775723 100644
--- a/app/src/main/res/values-en/strings.xml
+++ b/app/src/main/res/values-en/strings.xml
@@ -205,5 +205,6 @@
<string name="welcome_to_the_smart_energy_app">Welcome to the Smart Energy APP</string>
<string name="no_permissions_unable_to_receive_push">Unable to receive push notification If the permission is not enabled, you cannot receive push information.</string>
<string name="go_to_settings">Go to Settings</string>
+ <string name="system_positioning_switch">You need to turn on the system positioning switch. Otherwise, the system can obtain the position information.</string>
</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml
index 1cfc580..9192895 100644
--- a/app/src/main/res/values-zh/strings.xml
+++ b/app/src/main/res/values-zh/strings.xml
@@ -203,6 +203,7 @@
<string name="welcome_to_the_smart_energy_app">娆㈣繋鎵撳紑鏅烘収鑳芥簮APP</string>
<string name="no_permissions_unable_to_receive_push">閫氱煡鏉冮檺娌″紑鍚�,灏嗘棤娉曟敹鍒版帹閫佷俊鎭�.</string>
<string name="go_to_settings">鍓嶅線璁剧疆</string>
+ <string name="system_positioning_switch">闇�瑕佹墦寮�绯荤粺瀹氫綅寮�鍏�,鍚﹀垯鍙栨硶鑾峰彇浣嶇疆淇℃伅.</string>
</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 1cfc580..9192895 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -203,6 +203,7 @@
<string name="welcome_to_the_smart_energy_app">娆㈣繋鎵撳紑鏅烘収鑳芥簮APP</string>
<string name="no_permissions_unable_to_receive_push">閫氱煡鏉冮檺娌″紑鍚�,灏嗘棤娉曟敹鍒版帹閫佷俊鎭�.</string>
<string name="go_to_settings">鍓嶅線璁剧疆</string>
+ <string name="system_positioning_switch">闇�瑕佹墦寮�绯荤粺瀹氫綅寮�鍏�,鍚﹀垯鍙栨硶鑾峰彇浣嶇疆淇℃伅.</string>
</resources>
\ No newline at end of file
--
Gitblit v1.8.0