app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
@@ -18,6 +18,7 @@ import com.hdl.photovoltaic.HDLApp; import com.hdl.photovoltaic.R; import com.hdl.photovoltaic.bean.ModBusBean; import com.hdl.photovoltaic.config.AppConfigManage; import com.hdl.photovoltaic.config.UserConfigManage; import com.hdl.photovoltaic.internet.HttpServer.MyNanoHttpServer; import com.hdl.photovoltaic.listener.CloudCallBeak; @@ -1266,8 +1267,12 @@ data = new JSONObject(); } if (isTokenAndRefreshToken) { //小程序那里有自己的请求方法,需要这些数据 data.put("token", UserConfigManage.getInstance().getToken()); data.put("refreshToken", UserConfigManage.getInstance().getRefreshToken()); data.put("serverAddress", AppConfigManage.getUserRegionUrl()); data.put("appKey", AppConfigManage.getAppKey()); data.put("appSecret", AppConfigManage.getAppSecret()); } uniCallBackBaseBean.setData(data); return getJSONObject(uniCallBackBaseBean); app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java
@@ -6,6 +6,7 @@ import android.Manifest; import android.content.IntentFilter; import android.content.UriPermission; import android.content.pm.PackageManager; import android.os.Bundle; import android.os.Process; @@ -90,17 +91,6 @@ //监听网络状态变化 this.networkMonitoring(); // HdlOtaLogic.getInstance().startLocalService(new ServiceConnection() { // @Override // public void onServiceConnected(ComponentName name, IBinder service) { // // } // // @Override // public void onServiceDisconnected(ComponentName name) { // // } // }); }
@@ -62,11 +62,12 @@ */ private void initData() { // showLoading(); if (UserConfigManage.getInstance().isBAccount()) { this.getBUserInfo(); } else { this.getCMemberInfo(); } // if (UserConfigManage.getInstance().isBAccount()) { // this.getBUserInfo(); // } else { // this.getCMemberInfo(); // } //因为uni那边需要，启动的时候就读取啦 this.getResidenceTemperatureUnit(); } @@ -259,8 +260,12 @@ //接收外部点击事件 if (eventBus.getTopic().equals(ConstantManage.homepage_title_tab_switch)) { if (eventBus.getType().equals(HomepageTitleTabSwitch.me.toString())) { // HdlLogLogic.print("正在点击【我的】"); //读取头像 if (UserConfigManage.getInstance().isBAccount()) { this.getBUserInfo(); } else { this.getCMemberInfo(); } } } } app/src/main/java/com/hdl/photovoltaic/ui/me/PersonalDataActivity.java
@@ -35,7 +35,6 @@ import java.io.File; /** * 个人资料的界面 */ @@ -115,7 +114,7 @@ } changedUserAvatar(); } }); }, true); } }); @@ -292,7 +291,6 @@ intent.putExtra("memberName", UserConfigManage.getInstance().getUserName()); setResult(10, intent); } } app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseListFragment.java
@@ -88,12 +88,8 @@ // Intent intent = new Intent(); // intent.setClass(_mActivity, FastScanActivity.class); // startActivity(intent); String path = HDLUniMP.UNI_EVENT_OPEN_HOME_CREATION + "&token=" + UserConfigManage.getInstance().getToken() + "&refreshToken=" + UserConfigManage.getInstance().getRefreshToken() + "®ionUrl=" + AppConfigManage.getUserRegionUrl(); // // 打开小程序页面 HdlUniLogic.getInstance().openUniMP(path, null); HdlUniLogic.getInstance().openUniMP(HDLUniMP.UNI_EVENT_OPEN_HOME_CREATION, null); } @Override @@ -121,8 +117,7 @@ String path = HDLUniMP.UNI_EVENT_OPEN_HOME_DETAILS + "?homeId=" + houseIdBean.getHomeId() + "&homeName=" + houseIdBean.getHomeName() + "&powerStationStatus=" + houseIdBean.getPowerStationStatus() + "&serverAddress=" + AppConfigManage.getUserRegionUrl(); + "&powerStationStatus=" + houseIdBean.getPowerStationStatus(); HdlUniLogic.getInstance().openUniMP(path, null); } @@ -275,10 +270,7 @@ mPermissionsResultCallback = permissionsResultCallback; String[] s = new String[]{ Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.CAMERA, }; String[] s = new String[]{Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.CAMERA,}; String[] ary = PermissionUtils.checkPermission(_mActivity, s); if (ary.length > 0) { requestPermissions(ary, PermissionUtils.STATUS_SUCCESS); app/src/main/java/com/hdl/photovoltaic/utils/PermissionUtils.java
@@ -116,8 +116,9 @@ * @param activity - * @param permission - * @param permissionStateCallback - * @param is_skip 拒绝权限后是否引导到设置那里打开(true=引导) */ public static void requestPermissionsResultCallback(Activity activity, String permission, PermissionState permissionStateCallback) { public static void requestPermissionsResultCallback(Activity activity, String permission, PermissionState permissionStateCallback, boolean is_skip) { // String permission = Manifest.permission.WRITE_EXTERNAL_STORAGE; int status = PermissionUtils.getPermissionState(activity, permission); switch (status) { @@ -141,8 +142,10 @@ @Override public void onDenied(List<String> permissions, boolean never) { if (is_skip) { SharedPreUtils.putBoolean(permission, true); } } }); break; case PermissionUtils.STATUS_REFUSE_PERMANENT:
