新增通过后端获取国家地区信息接口

调整送联系方式礼物时，不选择其他礼物
调整联系方式礼物接口
调整在模拟器超大分辨率模式下，信箱ui异常问题

main/src/main/java/com/yunbao/main/activity/LoginActivity.java

@@ -14,7 +14,6 @@ import android.util.Log;
 import android.view.View;
 import android.view.inputmethod.InputMethodManager;
 import android.widget.EditText;
-import android.widget.Toast;
 
 import androidx.recyclerview.widget.RecyclerView;
 
@@ -36,12 +35,14 @@ import com.yunbao.common.bean.ConfigBean;
 import com.yunbao.common.bean.IMLoginModel;
 import com.yunbao.common.bean.LiveBean;
 import com.yunbao.common.bean.LoginData;
+import com.yunbao.common.bean.UserAreaBean;
 import com.yunbao.common.bean.UserBean;
 import com.yunbao.common.http.CommonHttpConsts;
 import com.yunbao.common.http.CommonHttpUtil;
 import com.yunbao.common.http.HttpCallback;
 import com.yunbao.common.http.HttpClient;
 import com.yunbao.common.http.JsonBean;
+import com.yunbao.common.http.live.LiveNetManager;
 import com.yunbao.common.interfaces.CommonCallback;
 import com.yunbao.common.manager.IMLoginManager;
 import com.yunbao.common.manager.NoviceInstructorManager;
@@ -100,6 +101,7 @@ public class LoginActivity extends AbsActivity {
     @Override
     protected void main() {
         EventBus.getDefault().register(this);
+        initUserArea();
         mRoot = findViewById(R.id.root);
         Contexts = this;
         activity = this;
@@ -364,6 +366,19 @@ public class LoginActivity extends AbsActivity {
         mUuidDevice = DeviceUtils.getUniqueDeviceId();
     }
 
+    private void initUserArea(){
+        LiveNetManager.get(mContext).getUserArea(new com.yunbao.common.http.base.HttpCallback<UserAreaBean>() {
+            @Override
+            public void onSuccess(UserAreaBean data) {
+                IMLoginManager.get(mContext).put("sys_user_area",data.getArea());
+            }
+
+            @Override
+            public void onError(String error) {
+            }
+        });
+    }
+
 
     @Override
     protected void onDestroy() {

main/src/main/java/com/yunbao/main/activity/RegisterActivity.java

@@ -192,7 +192,9 @@ public class RegisterActivity extends AbsActivity {
         allCountries.clear();
         allCountries.addAll(Country.getAll(mContext, null));
 
-        String ct = Locale.getDefault().getCountry();
+        //String ct = Locale.getDefault().getCountry();
+        String ct = IMLoginManager.get(mContext).getString("sys_user_area");
+        ToastUtil.show("地区:"+ct);
         ct = TextUtils.equals("CN", ct) ? "HK" : ct;
         for (int i = 0; i < allCountries.size(); i++) {
             if (allCountries.get(i).locale.equals(ct)) {