~wjc/HDLPhotovoltaicDebugAPP.git

			@@ -30,6 +30,8 @@
			import com.hdl.photovoltaic.base.CustomBaseActivity;
			import com.hdl.photovoltaic.config.UserConfigManage;
			import com.hdl.photovoltaic.databinding.ActivityHomeLoginBinding;
			import com.hdl.photovoltaic.listener.LinkCallBack;
			import com.hdl.photovoltaic.other.HdlDeviceLogic;
			import com.hdl.photovoltaic.other.HdlResidenceLogic;
			import com.hdl.photovoltaic.ui.account.ChangePassword;
			import com.hdl.photovoltaic.ui.account.RegisterAccountActivity;
			@@ -47,6 +49,7 @@
			import com.hdl.photovoltaic.widget.ConfirmationCancelDialog1;
			import com.hdl.photovoltaic.widget.ListDialog;
			import com.hdl.photovoltaic.widget.adapter.ListDialogAdapter;
			import com.hdl.sdk.link.common.exception.HDLLinkException;

			import java.util.List;

			@@ -118,7 +121,9 @@
			viewBinding.homeLoginRegisterTv.setVisibility(View.VISIBLE);
			}

			// String acc = "18402017839";
			String acc = "13375012441";
			// String acc = "18316672920";
			// String acc = "nuy13368@uzxia.com";
			String pws = "123456";
			//测试用
			@@ -163,15 +168,19 @@
			}
			});

			//输入账号
			viewBinding.homeLoginAccountEt.addTextChangedListener(accountTextWatcher);
			//清除账号按钮
			viewBinding.homeLoginClearContentsIv.setOnClickListener(new View.OnClickListener() {
			@Override
			public void onClick(View v) {
			viewBinding.homeLoginAccountEt.setText("");
			viewBinding.homeLoginClearContentsIv.setVisibility(View.GONE);
			}
			});

			//输入密码
			viewBinding.homeLoginPasswordEt.addTextChangedListener(passwordTextWatcher);
			//密码隐藏按钮
			viewBinding.homeLoginHideIv.setOnClickListener(new View.OnClickListener() {
			@Override
			public void onClick(View v) {
			@@ -199,7 +208,7 @@
			UserConfigManage.getInstance().setBAccount(v.isSelected());
			viewBinding.homeLoginCheckBCIv.setSelected(UserConfigManage.getInstance().isBAccount());
			if (UserConfigManage.getInstance().isBAccount()) {
			viewBinding.homeLoginRegisterTv.setVisibility(View.GONE);
			viewBinding.homeLoginRegisterTv.setVisibility(View.INVISIBLE);
			} else {
			viewBinding.homeLoginRegisterTv.setVisibility(View.VISIBLE);
			}
			@@ -234,45 +243,55 @@
			HdlAccountLogic.getInstance().regionByAccount(account, new CloudCallBeak<HDLUserRegionBean>() {
			@Override
			public void onSuccess(HDLUserRegionBean obj) {
			String APP_REGIONURL_TEST = "http://47.114.131.143:27199";
			AppConfigManage.setUserRegionUrl(APP_REGIONURL_TEST);
			//开发环境
			// String APP_REGIONURL_TEST = "http://47.114.131.143:27199";
			// AppConfigManage.setUserRegionUrl(APP_REGIONURL_TEST);
			//初始化服务域名
			// AppConfigManage.setUserRegionUrl(obj.getRegionUrl());
			AppConfigManage.setUserRegionUrl(obj.getRegionUrl());
			HDLLinkPMUser.getInstance().setUserRegionUrl(AppConfigManage.getUserRegionUrl());
			HdlAccountLogic.getInstance().loginByPassword(account, password, new ILoginCallBack() {
			@Override
			public void onSuccess(HDLLoginBean obj) {
			HdlResidenceLogic.getInstance().getResidenceIdList("", "", new CloudCallBeak<List<HouseIdBean>>() {
			@Override
			public void onSuccess(List<HouseIdBean> obj) {
			hideLoading();
			HdlResidenceLogic.getInstance().setHouseIdList(obj);
			restoreButtonStyleToInitializeState();
			if (UserConfigManage.getInstance().isBAccount()) {
			//安装商跳转界面
			startActivity(BPowerStationActivity.class);
			} else {
			//C端用户跳转界面
			startActivity(CPowerStationActivity.class);
			if (UserConfigManage.getInstance().isBAccount()) {
			restoreButtonStyleToInitializeState();
			//安装商跳转界面
			startActivity(BPowerStationActivity.class);
			hideLoading();
			finish();
			} else {
			//C端需要先获取电站列表;
			HdlResidenceLogic.getInstance().getResidenceIdList("", "", new CloudCallBeak<List<HouseIdBean>>() {
			@Override
			public void onSuccess(List<HouseIdBean> obj) {
			hideLoading();
			HdlResidenceLogic.getInstance().setHouseIdList(obj);
			restoreButtonStyleToInitializeState();
			if (UserConfigManage.getInstance().isBAccount()) {
			//安装商跳转界面
			startActivity(BPowerStationActivity.class);
			} else {
			//C端用户跳转界面
			startActivity(CPowerStationActivity.class);

			}
			finish();
			}
			finish();
			}

			@Override
			public void onFailure(HDLException e) {
			hideLoading();
			restoreButtonStyleToInitializeState();
			if (UserConfigManage.getInstance().isBAccount()) {
			//安装商跳转界面
			startActivity(BPowerStationActivity.class);
			} else {
			//C端用户跳转界面
			startActivity(CPowerStationActivity.class);
			@Override
			public void onFailure(HDLException e) {
			hideLoading();
			restoreButtonStyleToInitializeState();
			if (UserConfigManage.getInstance().isBAccount()) {
			//安装商跳转界面
			startActivity(BPowerStationActivity.class);
			} else {
			//C端用户跳转界面
			startActivity(CPowerStationActivity.class);
			}
			finish();
			}
			finish();
			}
			});
			});
			}
			}

			@Override
			@@ -485,27 +504,28 @@
			* 弹窗
			*/
			private void getDialog() {
			ConfirmationCancelDialog1 dialog = new ConfirmationCancelDialog1(_mActivity);
			dialog.show();
			// dialog.setTitle(getString(R.string.loading_privacy));
			dialog.isHideTitle(true);
			dialog.setContent(getString(R.string.loading_privacy_server));
			setStringDifferentColors(dialog.getContentTextView());
			dialog.setYesOnclickListener(new ConfirmationCancelDialog.onYesOnclickListener() {

			ConfirmationCancelDialog confirmationCancelDialog = new ConfirmationCancelDialog(_mActivity);
			confirmationCancelDialog.show();
			confirmationCancelDialog.isHideTitle(true);
			confirmationCancelDialog.setContent(getString(R.string.loading_privacy_server));
			setStringDifferentColors(confirmationCancelDialog.getContentTextView());
			confirmationCancelDialog.setConfirmation(getString(R.string.loading_agree));
			confirmationCancelDialog.setCancel(getString(R.string.loading_on_agree));
			confirmationCancelDialog.setYesOnclickListener(new ConfirmationCancelDialog.onYesOnclickListener() {
			@Override
			public void Confirm() {

			UserConfigManage.getInstance().setAcceiptPolicy(true);
			viewBinding.homeLoginPrivacyCheckIv.setSelected(true);
			dialog.dismiss();
			confirmationCancelDialog.dismiss();
			}
			});
			dialog.setNoOnclickListener(new ConfirmationCancelDialog.onNoOnclickListener() {
			confirmationCancelDialog.setNoOnclickListener(new ConfirmationCancelDialog.onNoOnclickListener() {
			@Override
			public void Cancel() {
			UserConfigManage.getInstance().setAcceiptPolicy(false);
			viewBinding.homeLoginPrivacyCheckIv.setSelected(false);
			dialog.dismiss();
			confirmationCancelDialog.dismiss();
			}
			});