mac
2024-01-11 dbff6d6f9200417ea60e2fe507b79cbe2eb7ea32
2024年01月11日18:19:42

备份代码
5个文件已修改
101 ■■■■ 已修改文件
app/src/main/java/com/hdl/photovoltaic/HDLApp.java 15 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/com/hdl/photovoltaic/internet/HttpServer/MyNanoHttpServer.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/com/hdl/photovoltaic/internet/HttpServer/MyNanoHttpService.java 26 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseListFragment.java 46 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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 {
@@ -241,6 +229,9 @@
        }
    }
    /**
     * 初始化极光SDK
     */
    private void initJPush() {
        JPushInterface.setDebugMode(true);
        JPushInterface.init(getBaseContext());
app/src/main/java/com/hdl/photovoltaic/internet/HttpServer/MyNanoHttpServer.java
@@ -25,7 +25,7 @@
public class MyNanoHttpServer extends NanoHTTPD {
    //声明服务端 端口
    public static final Integer HTTP_PORT = 49152;
    public static Integer HTTP_PORT = 49152;// 46219;
    public MyNanoHttpServer(String hostname, int port) {
        super(hostname, port);
app/src/main/java/com/hdl/photovoltaic/internet/HttpServer/MyNanoHttpService.java
@@ -4,8 +4,16 @@
import android.content.Intent;
import android.os.Binder;
import android.os.IBinder;
import android.text.TextUtils;
import androidx.annotation.Nullable;
import com.hdl.photovoltaic.other.HdlLogLogic;
import org.w3c.dom.Text;
import java.io.IOException;
import java.util.Objects;
/**
 * 本地服务器
@@ -21,12 +29,26 @@
        try {
            myNanoHttpServer.start();
        } catch (Exception e) {
//            if (serverSocket.isBound() && !serverSocket.isClosed()) {
//            if (myNanoHttpServer!=null&&myNanoHttpServer.gserverSocket.isBound() && !serverSocket.isClosed()) {
//                // Port is available
//            } else {
//                // Port is not available
//            }
            e.printStackTrace();
//            e.printStackTrace();
//            if (!TextUtils.isEmpty(e.getMessage()) && Objects.requireNonNull(e.getMessage()).contains("Address already in use")) {
//                myNanoHttpServer = null;
//                for (int i = MyNanoHttpServer.HTTP_PORT + 1; i < 65535; i++) {
//                    try {
//                        MyNanoHttpServer.HTTP_PORT = i;
//                        myNanoHttpServer = MyNanoHttpServer.getInstance(null);
//                        myNanoHttpServer.start();
//                    } catch (Exception ex) {
//                        String s = ex.getMessage();
//                    }
//                }
//
//            }
            HdlLogLogic.print("初始化Http服务器失败--->" + e.getMessage(), true);
            startService(new Intent(this, MyNanoHttpService.class));
        }
    }
app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java
@@ -2,21 +2,15 @@
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;
@@ -29,7 +23,6 @@
import com.hdl.photovoltaic.R;
import com.hdl.photovoltaic.base.CustomBaseActivity;
import com.hdl.photovoltaic.bean.MqttInfo;
import com.hdl.photovoltaic.broadcast.NetworkChangeReceiver;
import com.hdl.photovoltaic.config.ConstantManage;
import com.hdl.photovoltaic.config.UserConfigManage;
import com.hdl.photovoltaic.databinding.ActivityMyPowerStationBinding;
@@ -103,8 +96,7 @@
        //通知限权
        this.notificationSet();
        //初始化权限
        requestPermissions();
        this.requestPermissions();
    }
@@ -287,6 +279,8 @@
    public void requestPermissions() {
        //Manifest.permission.ACCESS_COARSE_LOCATION
        //ACCESS_FINE_LOCATION    允许使用GPS定位
        //ACCESS_COARSE_LOCATION    允许使用WIFI热点或基站来获取粗略的定位
        String[] ary = PermissionUtils.checkPermission(_mActivity, new String[]{Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.ACCESS_COARSE_LOCATION});
        if (ary.length > 0) {
            this.requestPermissions(ary, PermissionUtils.STATUS_SUCCESS);
app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseListFragment.java
@@ -70,18 +70,6 @@
        initView();
        //初始化界面监听器
        initEvent();
//        requestPermissions(new PermissionsResultCallback() {
//            @Override
//            public void succeed() {
//
//
//            }
//
//            @Override
//            public void failing() {
//            }
//        });
    }
    private void initEvent() {
@@ -91,21 +79,25 @@
        viewBinding.toolbarTopFragmentHouseListRl.topMoreIv.setOnClickListener(new View.OnClickListener() {
            @Override
            public void onClick(View v) {
                requestPermissions(new PermissionsResultCallback() {
                    @Override
                    public void succeed() {
//                        Intent intent = new Intent();
//                        intent.setClass(_mActivity, FastScanActivity.class);
//                        startActivity(intent);
//                        // 打开小程序页面
                        HdlUniLogic.getInstance().openUniMP(HDLUniMP.UNI_EVENT_OPEN_HOME_CREATION, null);
                    }
                HdlUniLogic.getInstance().openUniMP(HDLUniMP.UNI_EVENT_OPEN_HOME_CREATION, null);
                    @Override
                    public void failing() {
                    }
                });
//                requestPermissions(new PermissionsResultCallback() {
//                    @Override
//                    public void succeed() {
////                        Intent intent = new Intent();
////                        intent.setClass(_mActivity, FastScanActivity.class);
////                        startActivity(intent);
////                        // 打开小程序页面
//                        HdlUniLogic.getInstance().openUniMP(HDLUniMP.UNI_EVENT_OPEN_HOME_CREATION, null);
//                    }
//
//                    @Override
//                    public void failing() {
//                        HdlUniLogic.getInstance().openUniMP(HDLUniMP.UNI_EVENT_OPEN_HOME_CREATION, null);
//                    }
//                });
            }
        });
@@ -298,6 +290,10 @@
                    if (mPermissionsResultCallback != null) {
                        mPermissionsResultCallback.succeed();
                    }
                } else {
                    if (mPermissionsResultCallback != null) {
                        mPermissionsResultCallback.failing();
                    }
                }
            }