From 4598b51c90c695c9ccbe5350a84e4a46b9d8e587 Mon Sep 17 00:00:00 2001 From: mac <user@users-MacBook-Pro.local> Date: 星期三, 22 五月 2024 20:19:02 +0800 Subject: [PATCH] 2024年05月22日20:18:54 --- app/src/main/java/com/hdl/photovoltaic/ui/me/languageSelectionActivity.java | 73 ++++++++++++++++++++++++++++++++---- 1 files changed, 64 insertions(+), 9 deletions(-) diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/me/languageSelectionActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/me/languageSelectionActivity.java index 046e511..e35da67 100644 --- a/app/src/main/java/com/hdl/photovoltaic/ui/me/languageSelectionActivity.java +++ b/app/src/main/java/com/hdl/photovoltaic/ui/me/languageSelectionActivity.java @@ -4,20 +4,23 @@ import android.content.Intent; import android.os.Bundle; +import android.os.SystemClock; import android.view.View; +import com.hdl.linkpm.sdk.HDLLinkPMSdk; import com.hdl.photovoltaic.HDLApp; import com.hdl.photovoltaic.R; import com.hdl.photovoltaic.base.CustomBaseActivity; import com.hdl.photovoltaic.config.UserConfigManage; import com.hdl.photovoltaic.databinding.ActivityLanguageSelectionBinding; +import com.hdl.photovoltaic.other.HdlThreadLogic; import com.hdl.photovoltaic.ui.StartActivity; import com.hdl.photovoltaic.ui.adapter.LanguageAdapter; +import com.hdl.photovoltaic.uni.HDLUniMPSDKManager; import com.hdl.photovoltaic.utils.AppManagerUtils; import com.hdl.photovoltaic.utils.LocalManageUtil; import com.hdl.photovoltaic.widget.ConfirmationCancelDialog; -import java.util.ArrayList; import java.util.List; @@ -65,7 +68,7 @@ private void initEvent() { - viewBinding.toolbarTopFragmentHouseListRl.topBackBtn.setOnClickListener(new View.OnClickListener() { + viewBinding.toolbarTopFragmentHouseListRl.topBackLl.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { setResult(30); @@ -108,17 +111,69 @@ dialog.setYesOnclickListener(new ConfirmationCancelDialog.onYesOnclickListener() { @Override public void Confirm() { - UserConfigManage.getInstance().setCurrentAppLanguage(itemData.getLanguage()); - UserConfigManage.getInstance().Save(); - AppManagerUtils.getAppManager().finishAllActivity(); - Intent intent = new Intent(); - intent.setClass(HDLApp.getInstance(), StartActivity.class); - startActivity(intent); + dialog.dismiss(); + showLoading(getString(R.string.restarting_please_wait)); + HdlThreadLogic.runSubThread(new Runnable() { + @Override + public void run() { + if (!UserConfigManage.getInstance().isBAccount()) { + //鍥犱负C绔富鐣岄潰鏄痷ni鍐欑殑锛岃繖閲岃瑷�鍒囨崲蹇呴』鎶ni鍏虫帀鍐嶉噸鏂板惎鍔�,鍚﹀垯浼氭敹涓嶅埌uni鍙戣繃鏉ョ殑鏁版嵁(鎺ュ彛涓簄ull) + if (null != HDLUniMPSDKManager.getInstance().getUniMP()) { + HDLUniMPSDKManager.getInstance().getUniMP().closeUniMP(); + } + SystemClock.sleep(2000);//杩涚▼娌℃湁閭d箞蹇鏉�姝� + HDLUniMPSDKManager.getInstance().initDCUniMPSDK(HDLApp.getInstance()); + } + HdlThreadLogic.runMainThread(new Runnable() { + @Override + public void run() { + hideLoading(); + UserConfigManage.getInstance().setCurrentAppLanguage(itemData.getLanguage()); + UserConfigManage.getInstance().Save(); + //閰嶇疆鎺ュ彛璇锋眰璇█ + HDLLinkPMSdk.setLanguage(UserConfigManage.getInstance().getCurrentAppLanguage()); + + AppManagerUtils.getAppManager().finishAllActivity(); + Intent intent = new Intent(); + intent.setClass(HDLApp.getInstance(), StartActivity.class); + startActivity(intent); + } + }); + + } + }); +// UserConfigManage.getInstance().setCurrentAppLanguage(itemData.getLanguage()); +// UserConfigManage.getInstance().Save(); +// //閰嶇疆鎺ュ彛璇锋眰璇█ +// HDLLinkPMSdk.setLanguage(UserConfigManage.getInstance().getCurrentAppLanguage()); +// dialog.dismiss(); +// if (!UserConfigManage.getInstance().isBAccount()) { +// //鍥犱负C绔富鐣岄潰鏄痷ni鍐欑殑锛岃繖閲岃瑷�鍒囨崲蹇呴』鎶ni鍏虫帀鍐嶉噸鏂板惎鍔�,鍚﹀垯浼氭敹涓嶅埌uni鍙戣繃鏉ョ殑鏁版嵁(鎺ュ彛涓簄ull) +// if (null != HDLUniMPSDKManager.getInstance().getUniMP()) { +// HDLUniMPSDKManager.getInstance().getUniMP().closeUniMP(); +// } +// SystemClock.sleep(2000); +// HDLUniMPSDKManager.getInstance().initDCUniMPSDK(HDLApp.getInstance()); +// } +// AppManagerUtils.getAppManager().finishAllActivity(); +// Intent intent = new Intent(); +// intent.setClass(HDLApp.getInstance(), StartActivity.class); +// startActivity(intent); + } }); dialog.setNoOnclickListener(new ConfirmationCancelDialog.onNoOnclickListener() { @Override public void Cancel() { + //鍙栨秷涔嬪悗杩樺師涔嬪墠鐘舵�� + for (int i = 0; i < list.size(); i++) { + LanguageAdapter.ItemData data = list.get(i); + data.setState(false); + if (UserConfigManage.getInstance().getCurrentAppLanguage().equals(data.getLanguage())) { + data.setState(true); + } + } + languageAdapter.notifyDataSetChanged(); dialog.dismiss(); } }); @@ -127,7 +182,7 @@ private void initView() { viewBinding.toolbarTopFragmentHouseListRl.topTitleTv.setText(R.string.set_language_choice); viewBinding.toolbarTopFragmentHouseListRl.topTitleTv.setTextColor(getResources().getColor(R.color.text_030D1C, null)); - viewBinding.toolbarTopFragmentHouseListRl.topBackBtn.setVisibility(View.VISIBLE); + viewBinding.toolbarTopFragmentHouseListRl.topBackLl.setVisibility(View.VISIBLE); viewBinding.toolbarTopFragmentHouseListRl.topBarView.setBackgroundColor(getResources().getColor(R.color.text_FFFFFFFF, null)); LinearLayoutManager linearLayout = new LinearLayoutManager(_mActivity); languageAdapter = new LanguageAdapter(this.list, _mActivity); -- Gitblit v1.8.0