Revert "Revert "Merge branch 'hxb' into wjc""

wjc

2023-06-28 14de918a79943e4961b09fa01ed320c6cad41f2e

 app/src/main/java/com/hdl/photovoltaic/ui/HomeLoginActivity.java

@@ -20,11 +20,16 @@
import androidx.annotation.NonNull;
import androidx.appcompat.content.res.AppCompatResources;

import com.google.gson.Gson;
import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
import com.hdl.photovoltaic.HDLApp;
import com.hdl.photovoltaic.R;
import com.hdl.photovoltaic.base.CustomBaseActivity;
import com.hdl.photovoltaic.enums.ShowErrorMode;
import com.hdl.photovoltaic.other.HdlFileLogic;
import com.hdl.photovoltaic.other.HdlResidenceLogic;
import com.hdl.photovoltaic.ui.bean.HouseIdBean;
import com.hdl.photovoltaic.ui.bean.LoginUserBean;
import com.hdl.photovoltaic.ui.bean.LoginUserRegionBean;
import com.hdl.photovoltaic.config.AppConfigManage;
@@ -33,8 +38,14 @@
import com.hdl.photovoltaic.other.HdlAccountLogic;
import com.hdl.photovoltaic.other.HdlThreadLogic;
import com.hdl.photovoltaic.ui.device.FastScanActivity;
import com.hdl.photovoltaic.uni.HDLUniMP;
import com.hdl.photovoltaic.utils.PermissionUtils;
import com.hdl.photovoltaic.utils.WifiUtils;

import org.json.JSONException;
import org.json.JSONObject;

import java.util.List;


public class HomeLoginActivity extends CustomBaseActivity {
@@ -198,27 +209,22 @@
                        HdlAccountLogic.getInstance().loginByPassword(account, password, new CloudCallBeak<LoginUserBean>() {
                            @Override
                            public void onSuccess(LoginUserBean obj) {
                                HdlThreadLogic.runMainThread(new Runnable() {
                                HdlResidenceLogic.getInstance().getResidenceIdList("", "", new CloudCallBeak<List<HouseIdBean>>() {
                                    @Override
                                    public void run() {
                                        HdlResidenceLogic.getInstance().getResidenceList(1, 100, new CloudCallBeak<Boolean>() {
                                            @Override
                                            public void onSuccess(Boolean obj) {
                                                hideLoading();
                                                restoreButtonStyleToInitializeState();
                                                startActivity(MyPowerStationActivity.class);
                                            }

                                            @Override
                                            public void onFailure(Exception exception) {
                                                hideLoading();
                                                restoreButtonStyleToInitializeState();
                                                startActivity(MyPowerStationActivity.class);
                                            }
                                        });
                                    public void onSuccess(List<HouseIdBean> obj) {
                                        hideLoading();
                                        HdlResidenceLogic.getInstance().setHouseIdList(obj);
                                        restoreButtonStyleToInitializeState();
                                        startActivity(MyPowerStationActivity.class);
                                    }
                                }, null, null);

                                    @Override
                                    public void onFailure(Exception exception) {
                                        hideLoading();
                                        restoreButtonStyleToInitializeState();
                                        startActivity(MyPowerStationActivity.class);
                                    }
                                });
                            }

                            @Override
@@ -243,12 +249,7 @@
            public void onClick(View v) {
//                requestPermissions();
//                startActivity(MyPowerStationActivity.class);
                HdlThreadLogic.runMainThread(new Runnable() {
                    @Override
                    public void run() {
                        int s = 1 / 0;
                    }
                }, _mActivity, ShowErrorMode.YES);
                HdlFileLogic.getInstance().deleteDirectory(HdlFileLogic.getInstance().getCurrentHomeRootPath());
            }
        });

@@ -298,10 +299,15 @@
     * 恢复组件样式到初始化状态
     */
    private void restoreButtonStyleToInitializeState() {
        viewBinding.homeLoginLine1V.setBackgroundColor(getColor(R.color.text_E1E1E1));
        viewBinding.homeLoginAccountTextErrorTv.setText("");
        viewBinding.homeLoginLine2V.setBackgroundColor(getColor(R.color.text_E1E1E1));
        viewBinding.homeLoginPasswordTextErrorTv.setText("");
        HdlThreadLogic.runMainThread(new Runnable() {
            @Override
            public void run() {
                viewBinding.homeLoginLine1V.setBackgroundColor(getColor(R.color.text_E1E1E1));
                viewBinding.homeLoginAccountTextErrorTv.setText("");
                viewBinding.homeLoginLine2V.setBackgroundColor(getColor(R.color.text_E1E1E1));
                viewBinding.homeLoginPasswordTextErrorTv.setText("");
            }
        }, null, null);
    }

    /**
@@ -319,33 +325,4 @@
    }


    private void requestPermissions() {
        String[] ary = PermissionUtils.checkPermission(_mActivity, new String[]{Manifest.permission.ACCESS_FINE_LOCATION});
        if (ary.length > 0) {
            requestPermissions(ary, PermissionUtils.STATUS_SUCCESS);
        } else {
            wifi();
        }
    }

    @Override
    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
        if (requestCode == PermissionUtils.STATUS_SUCCESS) {
            for (int i = 0; i < permissions.length; i++) {
                if (grantResults[i] == PackageManager.PERMISSION_GRANTED) {
                    wifi();
                }

            }
        }

    }

    public void wifi() {
        WifiUtils wifiUtils = new WifiUtils(HDLApp.getInstance());
//        wifiUtils.getCurrentConnectWifiInfo();
//        wifiUtils.getScanResult();
        wifiUtils.connectWiFi("Application", "12345678", 3);
    }
}