From 43c0a28db7e43959561036dbde0eb5cb37a7e324 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期五, 10 五月 2024 18:25:40 +0800
Subject: [PATCH] 2024年05月10日18:25:29

---
 app/src/main/java/com/hdl/photovoltaic/ui/me/BindPhoneActivity.java |   50 ++++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 48 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/me/BindPhoneActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/me/BindPhoneActivity.java
index 9a3e08c..4316e8c 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/me/BindPhoneActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/me/BindPhoneActivity.java
@@ -9,11 +9,15 @@
 import com.hdl.linkpm.sdk.core.exception.HDLException;
 import com.hdl.photovoltaic.R;
 import com.hdl.photovoltaic.base.CustomBaseActivity;
+import com.hdl.photovoltaic.config.UserConfigManage;
 import com.hdl.photovoltaic.databinding.ActivityBindPhoneBinding;
 import com.hdl.photovoltaic.listener.CloudCallBeak;
 import com.hdl.photovoltaic.other.HdlAccountLogic;
 import com.hdl.photovoltaic.other.HdlLogLogic;
 import com.hdl.photovoltaic.other.HdlThreadLogic;
+import com.sahooz.library.countrypicker.Country;
+import com.sahooz.library.countrypicker.CountryPickerFragment;
+import com.sahooz.library.countrypicker.PickCountryCallback;
 
 /**
  * 淇敼缁戝畾鎵嬫満鍙风殑鐣岄潰
@@ -44,7 +48,14 @@
         viewBinding.toolbarTopFragmentHouseListRl.topBackBtn.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
+                setResult(20);
                 finish();
+            }
+        });
+        viewBinding.bindAreaParentRl.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                selectArea();
             }
         });
 
@@ -70,7 +81,10 @@
                     HdlAccountLogic.getInstance().bindingAccount_C(phoneStr, "", verificationStr, new CloudCallBeak<Boolean>() {
                         @Override
                         public void onSuccess(Boolean obj) {
-                            HdlThreadLogic.tipFlashingBox(_mActivity, true, getString(R.string.set_bind_phone_succeed), 0);
+                            UserConfigManage.getInstance().setBingPhone(phoneStr);
+                            UserConfigManage.getInstance().Save();
+                            setResult(20);
+                            finish();
                         }
 
                         @Override
@@ -89,6 +103,28 @@
         viewBinding.toolbarTopFragmentHouseListRl.topTitleTv.setTextColor(getResources().getColor(R.color.text_030D1C, null));
         viewBinding.toolbarTopFragmentHouseListRl.topBackBtn.setVisibility(View.VISIBLE);
         viewBinding.toolbarTopFragmentHouseListRl.topBarView.setBackgroundColor(getResources().getColor(R.color.text_FFFFFFFF, null));
+        try {
+            Country.load(this);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    /**
+     * 鍥藉鎵嬫満鍙峰尯鍙峰脊绐�
+     */
+    private void selectArea() {
+        CountryPickerFragment dialog = new CountryPickerFragment(this, new PickCountryCallback() {
+            @Override
+            public void onPick(Country country) {
+                if (country.flag != 0)
+                    viewBinding.bindAreaTv.setText(country.name);
+                String code = "+" + country.code;
+                viewBinding.bindAreaNumberTv.setText(code);
+            }
+        });
+        dialog.show();
+        dialog.setDialogSize();
     }
 
     /**
@@ -101,7 +137,7 @@
             HdlThreadLogic.tipFlashingBox(this, false, getString(R.string.home_login_phone_null), -1);
             return;
         }
-        HdlAccountLogic.getInstance().sendVerifyCode(true, account, "86", 3, new CloudCallBeak<Boolean>() {
+        HdlAccountLogic.getInstance().sendVerifyCode(true, account, viewBinding.bindAreaNumberTv.getText().toString(), 3, new CloudCallBeak<Boolean>() {
             @Override
             public void onSuccess(Boolean obj) {
                 countDownTimer.start();
@@ -162,10 +198,20 @@
     @Override
     protected void onDestroy() {
         super.onDestroy();
+        Country.destroy();
         if (countDownTimer != null) {
             countDownTimer.cancel();
             countDownTimer = null;
         }
 
     }
+
+    /**
+     * 鐗╃悊鎸夐敭杩斿洖浜嬩欢
+     */
+    @Override
+    public void onBackPressed() {
+        setResult(20);
+        super.onBackPressed();
+    }
 }
\ No newline at end of file

--
Gitblit v1.8.0