From 159dcb5c3b04a268c20c131df4ab99c1ae12e7db Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期五, 26 一月 2024 18:29:47 +0800
Subject: [PATCH] 2024年01月26日18:29:37
---
app/src/main/java/com/hdl/photovoltaic/HDLApp.java | 74 ++++++++----------------------------
1 files changed, 17 insertions(+), 57 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..8b72d3c 100644
--- a/app/src/main/java/com/hdl/photovoltaic/HDLApp.java
+++ b/app/src/main/java/com/hdl/photovoltaic/HDLApp.java
@@ -1,18 +1,9 @@
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;
@@ -24,7 +15,6 @@
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;
@@ -41,12 +31,10 @@
import org.greenrobot.eventbus.EventBus;
import java.util.HashMap;
-import java.util.Locale;
import java.util.Objects;
import cn.jpush.android.api.JPushInterface;
import io.dcloud.common.util.RuningAcitvityUtil;
-import io.dcloud.common.util.net.NetWork;
import okhttp3.logging.HttpLoggingInterceptor;
public class HDLApp extends Application {
@@ -83,7 +71,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 +151,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() {
@@ -234,6 +229,9 @@
}
}
+ /**
+ * 鍒濆鍖栨瀬鍏塖DK
+ */
private void initJPush() {
JPushInterface.setDebugMode(true);
JPushInterface.init(getBaseContext());
@@ -302,43 +300,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) {
- }
-
- });
- }
-
}
--
Gitblit v1.8.0