修改转账，付款等文案

app/src/main/AndroidManifest.xml

@@ -600,6 +600,10 @@
             android:name=".login.ChongZhiActivity"
             android:exported="true"
             android:screenOrientation="portrait" />
+        <activity
+            android:name=".main.mine.CloseAccountActivity"
+            android:exported="true"
+            android:screenOrientation="portrait" />
 
         <activity
             android:name=".main.message.NotifyMessageActivity"

app/src/main/java/com/dskj/rbchat/main/MainActivity.java

@@ -196,7 +196,7 @@ public class MainActivity extends BaseActivity {
 
 
     /**
-     * 转账
+     * 赠送
      */
     public static final int TYPE_TRANSFER = 1;
 
@@ -1814,7 +1814,7 @@ public class MainActivity extends BaseActivity {
     }
 
     /**
-     * 转账开关配置
+     * 赠送开关配置
      */
     private void getConfig() {
         Api.getInstance().getConfig()

app/src/main/java/com/dskj/rbchat/main/mine/AccountAndSecurityActivity.java

@@ -35,10 +35,13 @@ import com.tencent.mm.opensdk.openapi.IWXAPI;
 import com.tencent.mm.opensdk.openapi.WXAPIFactory;
 
 import com.dskj.rbchat.databinding.ActivitySecurityBinding;
+
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.schedulers.Schedulers;
+
 import com.dskj.rbchat.model.BindBean;
 import com.dskj.rbchat.model.LoginBean;
+
 public class AccountAndSecurityActivity extends BaseActivity {
 
     BindBean bean;
@@ -50,7 +53,7 @@ public class AccountAndSecurityActivity extends BaseActivity {
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         getWindow().setStatusBarColor(getResources().getColor(R.color.color_white));
         getWindow().setNavigationBarColor(getResources().getColor(R.color.color_white));
-        getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR|View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR);
+        getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR | View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR);
 
         super.onCreate(savedInstanceState);
         viewBinding = ActivitySecurityBinding.inflate(getLayoutInflater());
@@ -61,11 +64,11 @@ public class AccountAndSecurityActivity extends BaseActivity {
                 .unsubscribeOn(rx.schedulers.Schedulers.io())
                 .subscribe(changeImageViewBean -> {
                     LogUtils.i(GsonUtils.beanToJSONString(changeImageViewBean));
-                    if(changeImageViewBean.getType()==1){
+                    if (changeImageViewBean.getType() == 1) {
                         getAccessToken(changeImageViewBean.getCode());
-                    }else{
+                    } else {
                         ToastX.showShortToast(
-                                String.format(getResources().getString(R.string.login_fail),changeImageViewBean.getType()));
+                                String.format(getResources().getString(R.string.login_fail), changeImageViewBean.getType()));
                     }
                 });
 
@@ -92,7 +95,7 @@ public class AccountAndSecurityActivity extends BaseActivity {
                                 @Override
                                 public void onSuccess(@Nullable Void data) {
                                     if (AccountAndSecurityActivity.this.getApplicationContext() instanceof IMApplication) {
-                                        ((IMApplication)AccountAndSecurityActivity.this.getApplicationContext())
+                                        ((IMApplication) AccountAndSecurityActivity.this.getApplicationContext())
                                                 .clearActivity(AccountAndSecurityActivity.this);
                                     }
                                     DataUtils.set(AccountAndSecurityActivity.this, IMUIKitConfig.LOGIN_ACCOUNT, "");
@@ -115,16 +118,15 @@ public class AccountAndSecurityActivity extends BaseActivity {
 
     protected void initView() {
 
-        wxAPI = WXAPIFactory.createWXAPI(this, IMUIKitConfig.WECHAT_APPID,true);
+        wxAPI = WXAPIFactory.createWXAPI(this, IMUIKitConfig.WECHAT_APPID, true);
         wxAPI.registerApp(IMUIKitConfig.WECHAT_APPID);
         initListeners();
     }
 
 
-
     public void getAccessToken(String code) {
 
-        Api.getInstance().getAccessToken(IMUIKitConfig.WECHAT_APPID,IMUIKitConfig.WECHAT_SECRET,code,"authorization_code")
+        Api.getInstance().getAccessToken(IMUIKitConfig.WECHAT_APPID, IMUIKitConfig.WECHAT_SECRET, code, "authorization_code")
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(new BaseObserver1<WeiXinToken>() {
@@ -137,14 +139,14 @@ public class AccountAndSecurityActivity extends BaseActivity {
 
                     @Override
                     public void onError(int code, String msg) {
-                        ToastX.showShortToast( msg);
+                        ToastX.showShortToast(msg);
                     }
                 });
     }
 
     private void getWeiXinUserInfo(WeiXinToken result) {
 
-        Api.getInstance().getAccessUserInfo(result.getAccess_token(),result.getOpenid())
+        Api.getInstance().getAccessUserInfo(result.getAccess_token(), result.getOpenid())
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(new BaseObserver1<WeiXinInfo>() {
@@ -155,21 +157,20 @@ public class AccountAndSecurityActivity extends BaseActivity {
 
                     @Override
                     public void onError(int code, String msg) {
-                        ToastX.showShortToast( msg);
+                        ToastX.showShortToast(msg);
                     }
                 });
     }
 
 
-
     @Override
     protected void onResume() {
         super.onResume();
         loginBean = DataUtils.getLocUserInfo();
-        if(loginBean!=null) {
-            if(TextUtils.isEmpty(loginBean.getNwId())){
+        if (loginBean != null) {
+            if (TextUtils.isEmpty(loginBean.getNwId())) {
                 viewBinding.accoutTv.setText(getString(R.string.weishezhi_txt));
-            }else{
+            } else {
                 viewBinding.accoutTv.setText(loginBean.getNwId());
             }
 
@@ -182,10 +183,10 @@ public class AccountAndSecurityActivity extends BaseActivity {
         viewBinding.settingTitleBar.setOnBackIconClickListener(v -> onBackPressed());
 
         viewBinding.zhmmBt.setOnClickListener(v -> {
-            if(bean!=null) {
-                if(bean.getPhoneBind()== false){
+            if (bean != null) {
+                if (bean.getPhoneBind() == false) {
                     showDialog();
-                }else{
+                } else {
 //                    Intent intent = new Intent(AccountAndSecurityActivity.this,ChangeAccoutActionActivity.class);
 //                    intent.putExtra("type",ChangeAccoutActionActivity.TYPE_CHANGE_PASSWORD);
 //                    startActivity(intent);
@@ -199,30 +200,33 @@ public class AccountAndSecurityActivity extends BaseActivity {
         });
 
         viewBinding.bindPhoneBt.setOnClickListener(v -> {
-            if(bean!=null&&bean.getPhoneBind()== false) {
+            if (bean != null && bean.getPhoneBind() == false) {
                 Intent intent = new Intent(AccountAndSecurityActivity.this, ChangeAccoutActionActivity.class);
                 intent.putExtra("type", ChangeAccoutActionActivity.TYPE_BIND_PHONE);
                 startActivity(intent);
-            }else{
-                startActivity(new Intent(this,ChangePhoneActivity.class));
+            } else {
+                startActivity(new Intent(this, ChangePhoneActivity.class));
             }
         });
 
         viewBinding.bindWechatBt.setOnClickListener(v -> {
-            if(bean!=null&&bean.getWechatBind()== false){
+            if (bean != null && bean.getWechatBind() == false) {
                 SendAuth.Req req = new SendAuth.Req();
                 req.scope = "snsapi_userinfo";
                 req.state = String.valueOf(System.currentTimeMillis());
                 wxAPI.sendReq(req);
-            }else{
+            } else {
                 ToastX.showShortToast(R.string.yibind_wechat_txt);
 
             }
         });
-        viewBinding.accoutBt.setOnClickListener(v ->{
-            startActivityForResult(new Intent(AccountAndSecurityActivity.this,SettingAccoutIdActivity.class),888);
-        } );
-
+        viewBinding.accoutBt.setOnClickListener(v -> {
+            startActivityForResult(new Intent(AccountAndSecurityActivity.this, SettingAccoutIdActivity.class), 888);
+        });
+        viewBinding.closeAccount.setOnClickListener(v -> {
+            Intent intent = new Intent(this, CloseAccountActivity.class);
+            startActivity(intent);
+        });
 
     }
 
@@ -241,6 +245,7 @@ public class AccountAndSecurityActivity extends BaseActivity {
                 intent.putExtra("type", ChangeAccoutActionActivity.TYPE_BIND_PHONE);
                 startActivity(intent);
             }
+
             @Override
             public void toCancel() {
 
@@ -259,7 +264,7 @@ public class AccountAndSecurityActivity extends BaseActivity {
 
 
     private void bindWechat(WeiXinInfo obj) {
-        if(obj!=null&&loginBean!=null){
+        if (obj != null && loginBean != null) {
             obj.setUserId(loginBean.getUser_uid());
             obj.setSubstationId(IMUIKitConfig.SUBSTATIONID);
             Api.getInstance().bindWechat(obj)
@@ -275,7 +280,7 @@ public class AccountAndSecurityActivity extends BaseActivity {
 
                         @Override
                         public void onError(int code, String msg) {
-                            ToastX.showShortToast( msg);
+                            ToastX.showShortToast(msg);
                         }
                     });
         }
@@ -292,13 +297,13 @@ public class AccountAndSecurityActivity extends BaseActivity {
                         bean = feedbackResp.data;
                         //只有这是个参数允许切换
 //                        viewBinding.bindWechatTv.setText(feedbackResp.data.getWechatBind()?getString(R.string.yibangding_txt):getString(R.string.weibangding_txt));
-                        viewBinding.bindPhoneTv.setText(feedbackResp.data.getPhoneBind()?(feedbackResp.data.getAreaCode()+feedbackResp.data.getPhone()):getString(R.string.weibangding_txt));
+                        viewBinding.bindPhoneTv.setText(feedbackResp.data.getPhoneBind() ? (feedbackResp.data.getAreaCode() + feedbackResp.data.getPhone()) : getString(R.string.weibangding_txt));
 
                     }
 
                     @Override
                     public void onError(int code, String msg) {
-                        LogUtils.i("获取到的错误:"+code+""+ msg);
+                        LogUtils.i("获取到的错误:" + code + "" + msg);
 //                        WidgetUtils.showToast(getActivity(), msg, WidgetUtils.ToastType.ERROR);
                     }
                 });
@@ -307,8 +312,8 @@ public class AccountAndSecurityActivity extends BaseActivity {
     @Override
     protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
-        if(requestCode == 888 && resultCode == RESULT_OK){
-            if(loginBean!=null) {
+        if (requestCode == 888 && resultCode == RESULT_OK) {
+            if (loginBean != null) {
                 getUserInfo(loginBean.getUser_uid());
             }
         }
@@ -334,9 +339,9 @@ public class AccountAndSecurityActivity extends BaseActivity {
                             loginBean.getUser().setNwIdSetTime(feedbackResp.data.getNwIdSetTime());
                             DataUtils.set(AccountAndSecurityActivity.this, "login_bean", GsonUtils.beanToJSONString(loginBean));
 
-                            if(TextUtils.isEmpty(loginBean.getNwId())){
+                            if (TextUtils.isEmpty(loginBean.getNwId())) {
                                 viewBinding.accoutTv.setText(getString(R.string.weishezhi_txt));
-                            }else{
+                            } else {
                                 viewBinding.accoutTv.setText(loginBean.getNwId());
                             }
 

app/src/main/java/com/dskj/rbchat/main/mine/CloseAccountActivity.java

@@ -0,0 +1,260 @@
+// Copyright (c) 2022 NetEase, Inc. All rights reserved.
+// Use of this source code is governed by a MIT license that can be
+// found in the LICENSE file.
+
+package com.dskj.rbchat.main.mine;
+
+
+import android.app.Activity;
+import android.content.Intent;
+import android.os.Build;
+import android.os.Bundle;
+import android.os.CountDownTimer;
+import android.os.Handler;
+import android.text.Html;
+import android.text.TextUtils;
+import android.view.MotionEvent;
+import android.view.View;
+import android.view.inputmethod.InputMethodManager;
+
+import androidx.activity.result.ActivityResultLauncher;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.RequiresApi;
+
+import com.dskj.rbchat.IMApplication;
+import com.dskj.rbchat.IMUIKitConfig;
+import com.dskj.rbchat.R;
+import com.dskj.rbchat.databinding.ActivityChongzhiBinding;
+import com.dskj.rbchat.databinding.ActivityCloseAccountBinding;
+import com.dskj.rbchat.dialog.ActionConfirmDialog;
+import com.dskj.rbchat.dialog.ActionConfirmDialog1;
+import com.dskj.rbchat.login.LoginActivity;
+import com.dskj.rbchat.model.BindBean;
+import com.dskj.rbchat.model.CountryBean;
+import com.dskj.rbchat.model.RegisteredBean;
+import com.dskj.rbchat.network.Api;
+import com.dskj.rbchat.network.BaseObserver;
+import com.dskj.rbchat.network.Result;
+import com.dskj.rbchat.utils.AnimUtil;
+import com.dskj.rbchat.utils.Constant;
+import com.dskj.rbchat.utils.DataUtils;
+import com.dskj.rbchat.utils.LogUtils;
+import com.dskj.rbchat.welcome.WelcomeActivity;
+import com.netease.yunxin.kit.alog.ALog;
+import com.netease.yunxin.kit.common.ui.activities.BaseActivity;
+import com.netease.yunxin.kit.common.ui.dialog.LoadingDialog;
+import com.netease.yunxin.kit.common.ui.utils.ToastX;
+import com.netease.yunxin.kit.corekit.im.IMKitClient;
+import com.netease.yunxin.kit.corekit.im.login.LoginCallback;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.schedulers.Schedulers;
+
+/**
+ * 注销账号
+ */
+public class CloseAccountActivity extends BaseActivity {
+    protected ActivityResultLauncher<String[]> permissionLauncher;
+    private static final String TAG = "WelcomeActivity";
+    private ActivityCloseAccountBinding closeAccountBinding;
+    CountryBean countryBean;
+
+    @RequiresApi(api = Build.VERSION_CODES.M)
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        getWindow().setStatusBarColor(getResources().getColor(R.color.color_fcfcfc));
+        getWindow().setNavigationBarColor(getResources().getColor(R.color.color_white));
+
+        ALog.d(Constant.PROJECT_TAG, TAG, "onCreateView");
+        IMApplication.setColdStart(true);
+        closeAccountBinding = ActivityCloseAccountBinding.inflate(getLayoutInflater());
+        setContentView(closeAccountBinding.getRoot());
+        myCountDownTimer = new MyCountDownTimer(60000, 1000);
+        closeAccountBinding.aboutTitleBar.setOnBackIconClickListener(v -> {
+            onBackPressed();
+        });
+
+        countryBean = DataUtils.getLocCountry(CloseAccountActivity.this);
+        bindInfo(IMKitClient.account());
+
+
+        closeAccountBinding.sendSmsTv.setOnClickListener(v -> {
+            toStep2();
+        });
+
+        closeAccountBinding.tvCloseAccount.setOnClickListener(v -> {
+            //确认注销账号
+        });
+
+
+    }
+
+    BindBean bean;
+
+    private void bindInfo(String user_uid) {
+        Api.getInstance().bindInfo(user_uid)
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new BaseObserver<Result<BindBean>>() {
+                    @Override
+                    public void onSuccess(Result<BindBean> feedbackResp) {
+                        bean = feedbackResp.data;
+                        if (bean == null) {
+                            return;
+                        }
+                        hideSoftInput(CloseAccountActivity.this);
+                        if (!TextUtils.isEmpty(bean.getAreaCode()) && !TextUtils.isEmpty(bean.getPhone())) {
+                            closeAccountBinding.sendSmsTipsTv.setText(Html.fromHtml(String.format(getString(R.string.djfsyzm_txt),
+                                    bean.getAreaCode() + " " + bean.getPhone())));
+                        }
+                    }
+
+                    @Override
+                    public void onError(int code, String msg) {
+                        LogUtils.i("获取到的错误:" + code + "" + msg);
+//                        WidgetUtils.showToast(getActivity(), msg, WidgetUtils.ToastType.ERROR);
+                    }
+                });
+    }
+
+
+    private void toStep2() {
+        hideSoftInput(CloseAccountActivity.this);
+        Map<String, String> maps = new HashMap<>();
+        maps.put("phone", bean.getPhone());
+        maps.put("areaCode", bean.getAreaCode());
+        if (!TextUtils.isEmpty(IMUIKitConfig.SUBSTATIONID)) {
+            maps.put("substationId", IMUIKitConfig.SUBSTATIONID);
+        }
+        Api.getInstance().sendSmsForSetPassword(maps)
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new BaseObserver<Result<String>>() {
+
+                    @Override
+                    public void onSuccess(Result<String> feedbackResp) {
+                        myCountDownTimer.start();
+                        ActionConfirmDialog actionConfirmDialog = new ActionConfirmDialog(CloseAccountActivity.this, getString(R.string.yzmyfs_txt), false);
+                        actionConfirmDialog.show();
+                        closeAccountBinding.sendSmsTipsTv.setText(Html.fromHtml(String.format(getString(R.string.djfsyzm_txt1),
+                                bean.getAreaCode() + " " + bean.getPhone())));
+                    }
+
+                    @Override
+                    public void onError(int code, String msg) {
+                        LogUtils.i("获取到的错误:" + code + "" + msg);
+                        ToastX.showShortToast(msg);
+                    }
+                });
+
+
+    }
+
+
+    MyCountDownTimer myCountDownTimer;
+
+    //倒计时函数
+    private class MyCountDownTimer extends CountDownTimer {
+
+        public MyCountDownTimer(long millisInFuture, long countDownInterval) {
+            super(millisInFuture, countDownInterval);
+        }
+
+        //计时过程
+        @Override
+        public void onTick(long l) {
+            //防止计时过程中重复点击
+            closeAccountBinding.sendSmsTv.setClickable(false);
+//            getcodeTv.setTextColor(getResources().getColor(R.color.color_adb5bd));
+            closeAccountBinding.sendSmsTv.setText(String.format(getString(R.string.get_code1_txt), (l / 1000)));
+
+        }
+
+        //计时完毕的方法
+        @Override
+        public void onFinish() {
+            //重新给Button设置文字
+            closeAccountBinding.sendSmsTv.setText(R.string.get_code_txt);
+            //设置可点击
+            closeAccountBinding.sendSmsTv.setClickable(true);
+//            getcodeTv.setTextColor(getResources().getColor(R.color.colorAccent));
+
+        }
+    }
+
+
+    /**
+     * 隐藏软键盘
+     */
+    public void hideSoftInput(Activity activity) {
+        InputMethodManager imm = (InputMethodManager) getSystemService(INPUT_METHOD_SERVICE);
+        if (getCurrentFocus() != null && null != imm) {
+            imm.hideSoftInputFromWindow(getCurrentFocus().getWindowToken(), 0);
+        }
+//		View view = activity.getCurrentFocus();
+//
+//		if (view != null) {
+//
+//			InputMethodManager inputMethodManager = (InputMethodManager) activity.getSystemService(Activity.INPUT_METHOD_SERVICE);
+//
+//			inputMethodManager.hideSoftInputFromWindow(view.getWindowToken(), InputMethodManager.HIDE_NOT_ALWAYS);
+//
+//		}
+    }
+
+
+    @Override
+    public void onBackPressed() {
+        super.onBackPressed();
+    }
+
+
+    private void showMainActivityAndFinish() {
+        ALog.d(Constant.PROJECT_TAG, TAG, "showMainActivityAndFinish");
+        Intent intent = new Intent();
+        intent.setClass(this, LoginActivity.class);
+        intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP);
+        this.startActivity(intent);
+        finish();
+    }
+
+
+    public LoadingDialog loadingDialog;
+
+    public void showLoadingDialog() {
+        if (loadingDialog == null)
+            loadingDialog = new LoadingDialog(this);
+        loadingDialog.show();
+    }
+
+    public void showLoadingDialog(String msg) {
+        if (loadingDialog == null)
+            loadingDialog = new LoadingDialog(this);
+        loadingDialog.setLoadingText(msg);
+        loadingDialog.show();
+    }
+
+
+    public void dimessLoadingDialog() {
+        if (loadingDialog != null) {
+            loadingDialog.dismiss();
+        }
+
+    }
+
+    public boolean onTouchEvent(MotionEvent event) {
+        if (null != this.getCurrentFocus()) {
+            /**
+             * 点击空白位置 隐藏软键盘
+             */
+            InputMethodManager mInputMethodManager = (InputMethodManager) getSystemService(INPUT_METHOD_SERVICE);
+            return mInputMethodManager.hideSoftInputFromWindow(this.getCurrentFocus().getWindowToken(), 0);
+        }
+        return super.onTouchEvent(event);
+    }
+}

app/src/main/java/com/dskj/rbchat/model/PushBean.java

@@ -37,7 +37,7 @@ public class PushBean {
 
     public static List<PushBean> getList(){
         List<PushBean> typeBeans = new ArrayList<>();
-        //0 群红包，1 私聊红包，2 转账，3 金币银币互转
+        //0 群红包，1 私聊红包，2 赠送，3 金币银币互转
         typeBeans.add(new PushBean(0, IMApplication.getAppContext().getString(R.string.all_visible_txt)));
         typeBeans.add(new PushBean(1,IMApplication.getAppContext().getString(R.string.friend_visible_txt)));
         typeBeans.add(new PushBean(2,IMApplication.getAppContext().getString(R.string.onlyme_visible_txt)));

app/src/main/java/com/dskj/rbchat/model/TypeBean.java

@@ -37,8 +37,8 @@ public class TypeBean {
 
     public static List<TypeBean> getList(boolean isGold){
         List<TypeBean> typeBeans = new ArrayList<>();
-        //0 群红包，1 私聊红包，2 转账，3 金币银币互转
-        //0 群红包，1 私聊红包，2 转账，3 金币银币互转，4 充值，5 提现，6 直播间礼物，7 线下支付，8 第三方应用充值，
+        //0 群红包，1 私聊红包，2 赠送，3 金币银币互转
+        //0 群红包，1 私聊红包，2 赠送，3 金币银币互转，4 充值，5 提现，6 直播间礼物，7 线下支付，8 第三方应用充值，
         // 9 第三方应用提现，10 娃娃机收付款，11 电子游戏转入转出，12 管理员修改余额，13 牛牛下注冻结，14 牛牛结算，15 牛牛领包费
         typeBeans.add(new TypeBean(-1, IMApplication.getAppContext().getString(R.string.all_billing_txt)));
         if(isGold) {

app/src/main/java/com/dskj/rbchat/network/ApiService.java

@@ -375,7 +375,7 @@ public interface ApiService {
     Observable<Result<RedpacketGroupBean>> redGroupGiftPacketInfo(@Path("recordId") String userId);
 
     /**
-     * 发起转账
+     * 发起赠送
      */
     @POST("/wallet/transferMoney/initiate")
     Observable<Result<TransferBean>> transferMoney(@Body Map<String, Object> requestBody);
@@ -384,19 +384,19 @@ public interface ApiService {
     Observable<Result> transferCashPay(@Body Map<String, Object> requestBody);
 
     /**
-     * 接收转账
+     * 接收赠送
      */
     @POST("/wallet/transferMoney/receive")
     Observable<Result<TransferBean>> receiveTransferMoney(@Body Map<String, Object> requestBody);
 
     /**
-     * 转账详情
+     * 赠送详情
      */
     @GET("/wallet/transferMoney/{recordId}")
     Observable<Result<TransferBean>> receiveTransferMoney(@Path("recordId") String recordId);
 
     /**
-     * 退回转账
+     * 退回赠送
      */
     @POST("/wallet/transferMoney/return")
     Observable<Result<TransferBean>> transferMoneyReturn(@Body Map<String, Object> requestBody);
@@ -994,7 +994,7 @@ public interface ApiService {
 
 
     /**
-     * 获取转账开关配置
+     * 获取赠送开关配置
      */
     @GET("/config/list")
     Observable<Result<List<ConfigBean>>> getConfig();

app/src/main/java/com/dskj/rbchat/pay/PaymentActivity1.java

@@ -580,7 +580,7 @@ public class PaymentActivity1 extends BaseActivity {
     }
 
 
-    /*************************************************以下是去转账的流程***************************************************************/
+    /*************************************************以下是去赠送的流程***************************************************************/
     private LinearLayout layoutSelectorroot;
     private BackTitleBar title;
     private EditText editSelectorFriends;
@@ -935,7 +935,7 @@ public class PaymentActivity1 extends BaseActivity {
 
 
     }
-    /*************************************************以上是去转账的流程***************************************************************/
+    /*************************************************以上是去赠送的流程***************************************************************/
 
     public boolean onTouchEvent(MotionEvent event) {
         if(null != this.getCurrentFocus()){

app/src/main/java/com/dskj/rbchat/redpack/TransferAccountsActivity.java

@@ -64,7 +64,7 @@ public class TransferAccountsActivity extends BaseActivity {
 
     LoginBean u;
     WalletBean walletBean;
-    float number = 0;
+    int number = 0;
     PayCashFingerDialog payCashFingerDialog;
     PayCashDialog payDialog;
     private boolean isJinBi = false;
@@ -107,13 +107,13 @@ public class TransferAccountsActivity extends BaseActivity {
                     ToastX.showShortToast(R.string.zzjebnwk_txt);
                     return;
                 }
-                float number1 = Float.parseFloat(viewBinding.numberHintEt.getText().toString().trim()) * 100;
-                LogUtils.i("红包金额：" + number1);
-                if (number1 < 1) {
-                    ToastX.showShortToast(R.string.zzjebnsy_txt);
-
-                    return;
-                }
+//                long number1 = Long.parseLong(viewBinding.numberHintEt.getText().toString().trim()) * 100;
+//                LogUtils.i("红包金额：" + number1);
+//                if (number1 < 1) {
+//                    ToastX.showShortToast(R.string.zzjebnsy_txt);
+//
+//                    return;
+//                }
 
                 if (walletBean != null) {
                     if (Float.parseFloat(viewBinding.numberHintEt.getText().toString().trim()) > (isJinBi ? walletBean.getGoldCoin() / 100f : walletBean.getSilverCoin() / 100f)) {
@@ -146,7 +146,7 @@ public class TransferAccountsActivity extends BaseActivity {
 
                         return;
                     }
-                    number = Float.parseFloat(viewBinding.numberHintEt.getText().toString().trim());
+                    number = Integer.parseInt(viewBinding.numberHintEt.getText().toString().trim());
 
 //                    if(DataUtils.get(TransferAccountsActivity.this, "hasMianMi", false)){
 //                        toChange(null, number,2);
@@ -332,7 +332,7 @@ public class TransferAccountsActivity extends BaseActivity {
 //		}
     }
 
-    private void toChange(String password, float number, int type) {
+    private void toChange(String password, long number, int type) {
         hideSoftInput(this);
         HashMap<String, Object> maps = new HashMap<>();
         maps.put("amount", (int) (number * 100));

app/src/main/java/com/dskj/rbchat/redpack/TransferInfoActivity.java

@@ -409,7 +409,7 @@ public class TransferInfoActivity extends BaseActivity
 
                 NimUserInfo nimUserInfo = NIMClient.getService(UserService.class).getUserInfo(transferBean.getReceiverUid()+"");
                 if(nimUserInfo!=null){
-//                    viewBinding.titleTvv.setText("来自%s的金币转账")
+//                    viewBinding.titleTvv.setText("来自%s的金币赠送")
                     if(transferBean.getCoinType().equals(0)) {
                         viewBinding.titleTvv.setText(String.format(getString(R.string.xiangshuijinbi_txt),nimUserInfo.getName()));
                     }else{
@@ -447,7 +447,7 @@ public class TransferInfoActivity extends BaseActivity
 
                 NimUserInfo nimUserInfo = NIMClient.getService(UserService.class).getUserInfo(transferBean.getSenderUid()+"");
                 if(nimUserInfo!=null){
-//                    viewBinding.titleTvv.setText("来自%s的金币转账")
+//                    viewBinding.titleTvv.setText("来自%s的金币赠送")
                     if(transferBean.getCoinType().equals(0)) {
                         viewBinding.titleTvv.setText(String.format(getString(R.string.xiangshuijinbi_txt1),nimUserInfo.getName()));
                     }else{

app/src/main/java/com/dskj/rbchat/utils/QRCodeScheme.java

@@ -36,7 +36,7 @@ public class QRCodeScheme {
     /** 2维码内容前缀：储币机兑币 */
     public final static String QR_CODE_PSCHEME_PAYMENT_BEAD = "time_go_chat://payment_bead/";
     /**
-     * 2维码内容前缀：商家码转账
+     * 2维码内容前缀：商家码赠送
      */
     public final static String QR_CODE_PSCHEME_BIZ_RECEIVE = "time_go_chat://biz_receive_qr_code/";
 

app/src/main/java/com/dskj/rbchat/wallet/GiftInfoFragment.java

@@ -160,7 +160,7 @@ public class GiftInfoFragment extends BaseFragment {
 
 
     private String getTypeNoteString(BillBean s) {
-        //0 群红包，1 私聊红包，2 转账，3 金币银币互转
+        //0 群红包，1 私聊红包，2 赠送，3 金币银币互转
 
 
         if (s.getType() == 1) {

app/src/main/java/com/dskj/rbchat/wallet/WalletInfoFragment.java

@@ -315,13 +315,13 @@ public class WalletInfoFragment extends BaseFragment {
         }
     }
 
-    //转账给商家 type 31
+    //赠送给商家 type 31
     private String getAmount(BillBean s, long amount) {
         return status == 1 && s.getType() == 31 ? String.valueOf(amount) : AppUtils.getQian(amount);
     }
 
     private String getTypeNoteString(BillBean s) {
-        //0 群红包，1 私聊红包，2 转账，3 金币银币互转
+        //0 群红包，1 私聊红包，2 赠送，3 金币银币互转
 
         if (status == 1) {
             if (s.getType() == 1) {
@@ -363,7 +363,7 @@ public class WalletInfoFragment extends BaseFragment {
                         return getString(R.string.yinbizhuanzhang_tuikuan_txt);
                     }
 
-                    String name = "转账";
+                    String name = "赠送";
 //                    RosterElementEntity friendInfo = MyApplication.getInstance2().getIMClientManager().getFriendsListProvider().getFriendInfoByUid2(s.getFromUserId() + "");
                     NimUserInfo friendInfo = NIMClient.getService(UserService.class).getUserInfo(s.getFromUserId() + "");
 
@@ -375,7 +375,7 @@ public class WalletInfoFragment extends BaseFragment {
                     }
                     return name;
                 } else {
-                    String name = "红利积分转账";
+                    String name = "红利积分赠送";
                     NimUserInfo friendInfo = NIMClient.getService(UserService.class).getUserInfo(s.getToUserId() + "");
                     // ** 显示头像和昵称
                     if (friendInfo != null) {
@@ -507,7 +507,7 @@ public class WalletInfoFragment extends BaseFragment {
                         return getString(R.string.jinbizhuanzhang_tk_txt);
                     }
 
-                    String name = "转账";
+                    String name = "赠送";
 //                    RosterElementEntity friendInfo = MyApplication.getInstance2().getIMClientManager().getFriendsListProvider().getFriendInfoByUid2(s.getFromUserId() + "");
                     NimUserInfo friendInfo = NIMClient.getService(UserService.class).getUserInfo(s.getFromUserId() + "");
 
@@ -519,7 +519,7 @@ public class WalletInfoFragment extends BaseFragment {
                     }
                     return name;
                 } else {
-                    String name = "转账";
+                    String name = "赠送";
 //                    RosterElementEntity friendInfo = MyApplication.getInstance2().getIMClientManager().getFriendsListProvider().getFriendInfoByUid2(s.getToUserId() + "");
                     NimUserInfo friendInfo = NIMClient.getService(UserService.class).getUserInfo(s.getToUserId() + "");
 

app/src/main/res/layout/activity_chongzhi.xml

@@ -139,7 +139,7 @@
                 android:layout_gravity="center_horizontal"
                 android:layout_marginTop="@dimen/dp_20"
                 android:text="@string/get_code_txt"
-                android:textColor="@color/color_6b3689"
+                android:textColor="@color/color_6d94ff"
                 android:textSize="14sp" />
 
         </LinearLayout>

app/src/main/res/layout/activity_close_account.xml

@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/white"
+    android:orientation="vertical"
+    tools:context=".welcome.WelcomeActivity">
+
+    <com.netease.yunxin.kit.common.ui.widgets.BackTitleBar
+        android:id="@+id/about_title_bar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@color/color_fcfcfc"
+        app:titleText="@string/close_account_txt"
+        tools:ignore="MissingConstraints" />
+
+    <androidx.appcompat.widget.LinearLayoutCompat
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@android:color/white"
+        android:orientation="vertical">
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@color/color_ffecec"
+            android:paddingStart="@dimen/dp_15"
+            android:paddingTop="@dimen/dp_10"
+            android:paddingEnd="@dimen/dp_15"
+            android:paddingBottom="@dimen/dp_10"
+            android:text="@string/closeaccount_tips_txt"
+            android:textColor="@color/color_ff4040" />
+
+        <LinearLayout
+            android:id="@+id/step3_ly"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/dp_30"
+            android:orientation="vertical"
+            android:visibility="visible">
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="@dimen/dp_30"
+                android:layout_marginRight="@dimen/dp_30"
+                android:text="@string/qsryzm_txt"
+                android:textColor="@color/color_333333"
+                android:textSize="@dimen/sp_26"
+                android:textStyle="bold" />
+
+            <TextView
+                android:id="@+id/send_sms_tips_tv"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="@dimen/dp_30"
+                android:layout_marginTop="@dimen/dp_20"
+                android:layout_marginRight="@dimen/dp_30"
+                android:textColor="@color/color_7f7b81"
+                android:textSize="14sp" />
+
+
+            <com.dskj.rbchat.custom.PasswordEditText
+                android:id="@+id/password_edit_text_code"
+                android:layout_width="wrap_content"
+                android:layout_height="60dp"
+                android:layout_centerHorizontal="true"
+                android:layout_marginTop="60dp"
+                app:bgInputed="@drawable/bg_inputed"
+                app:bgInputing="@drawable/bg_inputing"
+                app:count="4"
+                app:passwordSize="26"
+                app:showPassword="true">
+
+            </com.dskj.rbchat.custom.PasswordEditText>
+
+            <TextView
+                android:id="@+id/send_sms_tv"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:layout_marginTop="@dimen/dp_20"
+                android:text="@string/get_code_txt"
+                android:textColor="@color/color_6d94ff"
+                android:textSize="14sp" />
+
+        </LinearLayout>
+
+
+        <ImageView
+            android:id="@+id/next_iv"
+            android:layout_width="@dimen/dp_64"
+            android:layout_height="@dimen/dp_64"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginTop="@dimen/dp_60"
+            android:src="@mipmap/step_next_img"
+            android:visibility="gone" />
+
+        <TextView
+            android:id="@+id/tvCloseAccount"
+            android:layout_width="match_parent"
+            android:layout_height="48dp"
+            android:layout_marginLeft="@dimen/dp_15"
+            android:layout_marginTop="@dimen/dp_40"
+            android:layout_marginRight="@dimen/dp_15"
+            android:layout_marginBottom="@dimen/dp_16"
+            android:background="@drawable/cornor_6d80ff_dp50"
+            android:gravity="center"
+            android:singleLine="true"
+            android:text="@string/close_account_confirm_txt"
+            android:textColor="@color/colorWhite"
+            android:textSize="@dimen/dp_16"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/notify_message_ll"
+            tools:ignore="NotSibling,SpUsage" />
+
+    </androidx.appcompat.widget.LinearLayoutCompat>
+
+
+</LinearLayout>

app/src/main/res/layout/activity_security.xml

@@ -118,6 +118,25 @@
                android:text="@string/quxiugai_txt"
                android:textColor="@color/color_666666" />
        </FrameLayout>
+
+       <FrameLayout
+           android:visibility="gone"
+           android:layout_width="match_parent"
+           android:layout_height="wrap_content">
+
+           <Button
+               android:id="@+id/close_account"
+               style="@style/settings_item_bg_group_top_2019"
+               android:text="@string/close_account_txt" />
+
+           <TextView
+               android:id="@+id/close_account_tv"
+               style="@style/settings_item_textView"
+               android:drawablePadding="10dp"
+               android:drawableRight="@drawable/ic_frame_mine_right_arrow"
+               android:text=""
+               android:textColor="@color/color_666666" />
+       </FrameLayout>
        <TextView
            android:id="@+id/tvLogout"
            android:layout_width="match_parent"
@@ -130,7 +149,7 @@
            android:background="@drawable/index_user_bg3"
            android:gravity="center"
            android:singleLine="true"
-           android:text="@string/tab_mine_logout"
+           android:text="@string/close_account_txt"
            android:textColor="@color/colorWhite"
            android:textSize="@dimen/dp_16"
            app:layout_constraintEnd_toEndOf="parent"

app/src/main/res/layout/activity_transfer_accounts.xml

@@ -185,7 +185,7 @@
             android:drawablePadding="@dimen/dp_16"
             android:gravity="center_vertical|right"
             android:hint="@string/amount_input_hint_txt"
-            android:inputType="numberDecimal"
+            android:inputType="number"
             android:paddingLeft="@dimen/dp_22"
             android:textColor="@color/black"
             android:textColorHint="@color/color_adb5bd"

app/src/main/res/layout/activity_transfer_info.xml

@@ -33,7 +33,7 @@
             android:paddingStart="@dimen/dp_20"
             android:paddingEnd="@dimen/dp_20"
             android:gravity="center"
-            android:text="来自 Jeffrey 的金币转账"
+            android:text="来自 Jeffrey 的金币赠送"
             android:textColor="#ff333333"
             android:textSize="18sp"
             />
@@ -204,7 +204,7 @@
                 android:layout_height="wrap_content"
                 android:gravity="center_vertical|right"
                 android:minHeight="50dp"
-                android:text="转账说明"
+                android:text="赠送说明"
                 android:textColor="@color/color_333333"
                 android:textSize="14sp" />
         </LinearLayout>

app/src/main/res/layout/dialog_pay_cash.xml

@@ -92,7 +92,7 @@
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="付款方式"
+                android:text="@string/fukuanfangshi_txt"
                 android:layout_centerVertical="true"
                 android:textColor="#ff7e7b84"
                 android:textSize="14sp"

app/src/main/res/layout/item_bill_list.xml

@@ -43,7 +43,7 @@
             android:id="@+id/status_tv"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="已全额退款"
+            android:text="已全额退還"
             android:textColor="#fff35543"
             android:textSize="12sp"
             android:visibility="gone" />

app/src/main/res/values-en/strings.xml

@@ -213,6 +213,8 @@
     <string name="weishezhi_txt">Not set</string>
     <string name="wechat_txt">WeChat</string>
     <string name="phone_number_txt">Mobile phone number</string>
+    <string name="close_account_txt">Close Account</string>
+    <string name="close_account_confirm_txt">Confirm Account Closure</string>
     <string name="accout_password_txt">Account password</string>
     <string name="yibangding_txt">Bound</string>
     <string name="weibangding_txt">Unbound</string>
@@ -360,15 +362,15 @@
     <string name="send_in_redenvelope_txt1">Put Cash into the red envelope</string>
     <string name="send_in_redtype_txt1">Put gold coins into the red envelope</string>
     <string name="no_get_to_back_txt">If not collected within 24 hours, the red envelope amount will be returned</string>
-    <string name="zhuanzhangobject_txt">Click to select transfer object</string>
-    <string name="zhuanzhangjine_txt">Transfer amount</string>
-    <string name="zhuanzhangjineto_txt">Transfer to:%s</string>
-    <string name="transfer_instructions_hint_txt">(optional) Enter transfer instructions</string>
-    <string name="fqzz_txt">Initiate transfer</string>
-    <string name="no_get_to_back_t_txt">If the payment is not received within 24 hours, the transferred amount will be automatically collected</string>
-    <string name="timeout_transfer_tips_txt">If payment is not received within 24 hours, the transferred amount will be automatically collected</string>
-    <string name="transfer_instructions_txt">Transfer instructions</string>
-    <string name="transfer_time_txt">Transfer time</string>
+    <string name="zhuanzhangobject_txt">Click to select give away object</string>
+    <string name="zhuanzhangjine_txt">Give away amount</string>
+    <string name="zhuanzhangjineto_txt">Give away to:%s</string>
+    <string name="transfer_instructions_hint_txt">(optional) Enter give away instructions</string>
+    <string name="fqzz_txt">Initiate give away</string>
+    <string name="no_get_to_back_t_txt">If the payment is not received within 24 hours, the give away amount will be automatically collected</string>
+    <string name="timeout_transfer_tips_txt">If payment is not received within 24 hours, the give away amount will be automatically collected</string>
+    <string name="transfer_instructions_txt">Give away instructions</string>
+    <string name="transfer_time_txt">Give away time</string>
     <string name="get_transfer_time_txt">Receipt time</string>
     <string name="collection_transfer_txt">Collection</string>
     <string name="refund_transfer_txt">Refund</string>
@@ -406,19 +408,19 @@
     <string name="zfmmcw_txt">Incorrect payment password, please try again</string>
     <string name="hqqbxxsb_txt">Failed to obtain wallet information</string>
     <string name="send_in_redenvelope_txt2">Put silver coins into red envelopes</string>
-    <string name="zhuanzhang_txt">[Silver Coin Transfer]</string>
-    <string name="zzjebnwk_txt">Transfer amount cannot be empty</string>
+    <string name="zhuanzhang_txt">[Silver Coin Give away]</string>
+    <string name="zzjebnwk_txt">Give away amount cannot be empty</string>
     <string name="zzjebnwk_txt1">The payment amount cannot be empty</string>
-    <string name="zzjebnsy_txt">The transfer amount cannot be less than 0.01</string>
+    <string name="zzjebnsy_txt">Give away amount cannot be less than 0.01</string>
     <string name="zzjebnsy_txt1">The payment amount cannot be empty and cannot be less than 0.01</string>
 
     <string name="hqqbxxsb_tx">Failed to obtain wallet information</string>
-    <string name="nqdythzz_txt">Are you sure you want to refund the transfer? </string>
-    <string name="nqdythzz_txt1">Are you sure you want to refund %s transfer? </string>
+    <string name="nqdythzz_txt">Are you sure you want to refund the give away? </string>
+    <string name="nqdythzz_txt1">Are you sure you want to refund %s give away? </string>
     <string name="tuihuan_txt">Return</string>
     <string name="ndqbbdj_txt">Your gold coins are frozen, please contact customer service if you need to unfreeze</string>
     <string name="lxkh_txt">Contact customer service</string>
-    <string name="zhuanzhang_tips1_txt">If the other party does not receive payment within 1 day, the transfer amount will be automatically transferred to the balance of the pay</string>
+    <string name="zhuanzhang_tips1_txt">If the other party does not receive payment within 1 day, the give away amount will be automatically give away to the balance of the pay</string>
     <string name="daishoukuan_txt">Waiting for %s to receive payment</string>
     <string name="yishoukuan_txt">%s has been paid</string>
     <string name="yzdsk_txt">%s has automatically received payment</string>
@@ -426,14 +428,14 @@
     <string name="yzdtk_txt">%s has been automatically refunded</string>
     <string name="ytkdye_txt">Refunded to balance</string>
     <string name="dfwbdsjhytkdye_txt">The other party has not bound a mobile phone number, and the balance has been refunded</string>
-    <string name="zhuangzhang_tips2_txt">If the payment is not received within 1 day, the transfer amount will be automatically transferred to the balance</string>
+    <string name="zhuangzhang_tips2_txt">If the payment is not received within 1 day, the give away amount will be automatically give away to the balance</string>
     <string name="dainishoukuan_txt">Waiting for your payment</string>
     <string name="ninyishoukuan_txt">You have received payment</string>
     <string name="niyizdsk_txt">You have automatically received payment</string>
     <string name="nyth_txt">You have returned</string>
     <string name="ytkddfye_txt">Refunded to the balance of the other party</string>
     <string name="wbdsjhytkddfye_txt">The system has automatically refunded</string>
-    <string name="zhuanzhang_title_txt">Transfer</string>
+    <string name="zhuanzhang_title_txt">Give away</string>
     <string name="fahongbao_txt">Send red envelope</string>
     <string name="ge_txt">pieces</string>
     <string name="voom_message_txt">[Short video message]</string>
@@ -480,9 +482,9 @@
     <string name="yinbi_tuikuan_txt">Silver Coin Red Packet-Refund</string>
     <string name="yinbihongbao_laizi_txt">Silver coin red envelope-from</string>
     <string name="yinbihonbao_wofagei_txt">Silver coin red envelope-I will send it</string>
-    <string name="yinbizhuanzhang_tuikuan_txt">Silver coin transfer-refund</string>
-    <string name="yinbizhuanzhang_laizi_txt">Silver coin transfer-from</string>
-    <string name="yinbizhuanzhang_wofagei_txt">Silver coin transfer-I send it</string>
+    <string name="yinbizhuanzhang_tuikuan_txt">Silver coin give away-refund</string>
+    <string name="yinbizhuanzhang_laizi_txt">Silver coin give away-from</string>
+    <string name="yinbizhuanzhang_wofagei_txt">Silver coin give away-I send it</string>
     <string name="yinbiqunhongbao_tuikuan_txt">Silver Coin Group Red Packet-Refund</string>
     <string name="yinbiqunhongbao_txt">Silver coin group red envelope</string>
     <string name="ybqhb_wfg_txt">Silver coin group red envelope-I will send it</string>
@@ -493,9 +495,9 @@
     <string name="jinbihongbao_tuikuan_txt">Gold coin red envelope-refund</string>
     <string name="jinbihongbao_laizi_txt">Gold coin red envelope-from</string>
     <string name="jinbihongbao_wfg_txt">Gold coin red envelope-I will send it</string>
-    <string name="jinbizhuanzhang_tk_txt">Gold coin transfer-refund</string>
-    <string name="jinbizhuanzhang_laizi_txt">Gold coin transfer-from</string>
-    <string name="jinbizhuanzhang_wofagei_txt">Gold coin transfer-I will send it</string>
+    <string name="jinbizhuanzhang_tk_txt">Gold coin give away-refund</string>
+    <string name="jinbizhuanzhang_laizi_txt">Gold coin give away-from</string>
+    <string name="jinbizhuanzhang_wofagei_txt">Gold coin give away-I will send it</string>
     <string name="jinbiqunhongbao_tuikuan_txt">Gold Coin Group Red Packet-Refund</string>
     <string name="jinbiqunhongbao_txt">Gold coin group red envelope</string>
     <string name="jinbiqunhongbao_wfg_txt">Gold coin group red envelope-I will send it</string>
@@ -509,9 +511,9 @@
     <string name="wawaji_txt">Taole Town</string>
     <string name="guanliyuanxiugai_txt">Administrator modification</string>
     <string name="jinbitixian_txt">Gold coin withdrawal</string>
-    <string name="zhuanchu_txt">Transfer</string>
+    <string name="zhuanchu_txt">Give away</string>
     <string name="fffcz_txt">Game recharge</string>
-    <string name="zhuanru_txt">Transfer</string>
+    <string name="zhuanru_txt">Give away</string>
     <string name="ffftx_txt">Game withdrawal</string>
     <string name="laxinsjf_txt">Invite friends to register and get points</string>
     <string name="niuniuxiazhudongjie_txt">Niuniu Betting Freeze</string>
@@ -521,11 +523,11 @@
     <string name="all_billing_txt">All bills</string>
     <string name="group_redpack_txt">Group red packet</string>
     <string name="redpacket_txt">Red envelope</string>
-    <string name="jinyinbihuzhuan_txt">Gold and silver coin transfer</string>
+    <string name="jinyinbihuzhuan_txt">Gold and silver coin give away</string>
     <string name="withdrawal_txt">Withdrawal</string>
     <string name="youxichongzhi_txt">Game recharge</string>
     <string name="youxitixian_txt">Game withdrawal</string>
-    <string name="zhuanzhang_txt1">Transfer</string>
+    <string name="zhuanzhang_txt1">Give away</string>
 
     <string name="addfriends_id">ID</string>
     <string name="addfriends_phone">Phone number</string>
@@ -551,7 +553,7 @@
     <string name="zlnddt_txt">Liked your post</string>
     <string name="post_updates_txt">Post updates</string>
     <string name="wawajishoufukuan_txt">Claw machine collection and payment</string>
-    <string name="dianziyouxizhuanru_txt">Electronic game transfer in and out</string>
+    <string name="dianziyouxizhuanru_txt">Electronic game give away in and out</string>
     <string name="fukuanjine_txt">Payment amount</string>
     <string name="tianjiabeizhu_txt">Add remarks (optional)</string>
     <string name="skrkjzdes_txt">The payee is visible, up to 20 characters</string>
@@ -564,15 +566,15 @@
     <string name="bind_phone_des_txt1">Please set the payment password first</string>
 
     <string name="save_teamcode_join_txt">Please note: All %s users can join your group through this link</string>
-    <string name="teamsetting_transfer">Confirm whether to transfer the group owner position to [%s]? </string>
-    <string name="teamsetting_quitemanager">You are the group leader. You need to transfer the group leader permissions before you can exit the group chat.</string>
+    <string name="teamsetting_transfer">Confirm whether to give away the group owner position to [%s]? </string>
+    <string name="teamsetting_quitemanager">You are the group leader. You need to give away the group leader permissions before you can exit the group chat.</string>
     <string name="teamsetting_quitemanager_onlyone">There are no other members in this group chat. The group will be disbanded directly after exiting. Are you sure you want to exit?</string>
     <string name="teamsetting_quiteconfirm">Are you sure you want to leave the group chat? After exiting, all messages in the group chat will be lost</string>
     <string name="queit_text">Exit</string>
-    <string name="transfer_text">Transfer</string>
-    <string name="transfer_fail">The contact is not a friend, the group owner\'s transfer failed! </string>
-    <string name="transfer_failmsg">Group owner transfer failed! %s</string>
-    <string name="transfer_success">Group owner permission transfer successful</string>
+    <string name="transfer_text">Give away</string>
+    <string name="transfer_fail">The contact is not a friend, the group owner\'s give away failed! </string>
+    <string name="transfer_failmsg">Group owner give away failed! %s</string>
+    <string name="transfer_success">Group owner permission give away successful</string>
     <string name="teamsetting_other">Other settings</string>
     <string name="teamsetting_other_teamname">Group name</string>
     <string name="teamsetting_other_addtype">Automatically add members</string>
@@ -584,7 +586,7 @@
     <string name="teamsetting_other_announcement_hint">Enter group announcement content</string>
     <string name="teamsetting_other_announcement_onlymanager">Only group owner can edit/publish</string>
     <string name="teamsetting_other_teamdiss">Dismiss</string>
-    <string name="teamsetting_other_teamtransfer">Group owner permission transfer</string>
+    <string name="teamsetting_other_teamtransfer">Group owner permission give away</string>
     <string name="teamsetting_other_teamdisstips">After disbanding the group chat, both the group members and the group owner will be removed from the group chat</string>
     <string name="teamsetting_other_teamzlfm">Group profile cover</string>
     <string name="wyydbty_txt">I have read and agree</string>
@@ -639,10 +641,10 @@
     <string name="qxxzjbyy_txt">Please select the reason for reporting first</string>
     <string name="qxtxjtqksm_txt">Please fill in the specific situation first</string>
     <string name="zdxzsg_txt">Select up to three</string>
-    <string name="xiangshuijinbi_txt">Transfer gold coins to %s</string>
-    <string name="xiangshuiyinbi_txt">Transfer silver coins to %s</string>
-    <string name="xiangshuijinbi_txt1">Gold coin transfer from %s</string>
-    <string name="xiangshuiyinbi_txt1">Silver transfer from %s</string>
+    <string name="xiangshuijinbi_txt">Give away gold coins to %s</string>
+    <string name="xiangshuiyinbi_txt">Give away silver coins to %s</string>
+    <string name="xiangshuijinbi_txt1">Gold coin give away from %s</string>
+    <string name="xiangshuiyinbi_txt1">Silver give away from %s</string>
 
     <string name="saoyisao_txt">Scan</string>
     <string name="shoukuan_title_txt">Receipt</string>
@@ -710,7 +712,7 @@
     <string name="genghuancheng_to_login_txt1">Password reset completed, please log in to your account again</string>
     <string name="systemmessage_txt">[System Information]</string>
     <string name="ps_completed">@string/setting_complete</string>
-    <string name="qxxzzzdx_txt">Please select the transfer recipient first</string>
+    <string name="qxxzzzdx_txt">Please select the give away recipient first</string>
     <string name="zfjecgxz_txt">The payment amount exceeds the limit. For the safety of your funds, please enter a password for payment</string>
     <string name="tcdl_tips_txt1">Your account is logged in on another device. If it is not operated by yourself, the password may be leaked. Please change it as soon as possible</string>
     <string name="duibiji_txt">Coin ATM</string>
@@ -887,4 +889,5 @@
     <string name="activitymessage_details">Activity Details</string>
     <string name="cash_paytype">Payment Method</string>
     <string name="cash_paytype_card">Credit Card Payment</string>
+    <string name="closeaccount_tips_txt">After the account is closed, your user information will be erased and cannot be recovered. Any related rights, such as transaction history and account balance, will be considered automatically forfeited and void</string>
 </resources>

app/src/main/res/values-ja/strings.xml

@@ -209,6 +209,8 @@
     <string name="weishezhi_txt">設定されていません</string>
     <string name="wechat_txt">WeChat</string>
     <string name="phone_number_txt">携帯電話番号</string>
+    <string name="close_account_txt">アカウントを削除する</string>
+    <string name="close_account_confirm_txt">アカウントを削除する</string>
     <string name="accout_password_txt">アカウントのパスワード</string>
     <string name="yibangding_txt">バウンド</string>
     <string name="weibangding_txt">非バインド</string>
@@ -885,4 +887,6 @@
     <string name="activitymessage_details">イベントの詳細</string>
     <string name="cash_paytype">支払い方法</string>
     <string name="cash_paytype_card">クレジットカード支払い</string>
+    <string name="closeaccount_tips_txt">アカウントを削除すると、ユーザー情報はすべて消去され、復元することはできません。取引履歴やアカウント残高などの関連する権利も自動的に放棄されたものと見なされ、無効になります</string>
+
 </resources>

app/src/main/res/values-zh/strings.xml

@@ -209,6 +209,8 @@
     <string name="weishezhi_txt">未设置</string>
     <string name="wechat_txt">微信</string>
     <string name="phone_number_txt">手机号</string>
+    <string name="close_account_txt">注销账号</string>
+    <string name="close_account_confirm_txt">确认注销</string>
     <string name="accout_password_txt">帐号密码</string>
     <string name="yibangding_txt">已绑定</string>
     <string name="weibangding_txt">未绑定</string>
@@ -355,16 +357,16 @@
     <string name="send_in_redenvelope_txt1">塞Cash进红包</string>
     <string name="send_in_redtype_txt1">塞金币进红包</string>
     <string name="no_get_to_back_txt">未领取的红包，将于24小时候退回</string>
-    <string name="zhuanzhangobject_txt">点击选择转账对象</string>
-    <string name="zhuanzhangjine_txt">转账金额</string>
-    <string name="zhuanzhangjineto_txt">转账给:%s</string>
-    <string name="transfer_instructions_hint_txt">（选填）输入转账说明</string>
-    <string name="fqzz_txt">发起转账</string>
-    <string name="no_get_to_back_t_txt">24小时内未收款，转账金额将被自动领取</string>
-    <string name="timeout_transfer_tips_txt">24小时内未收款，转账金额将被自动领取</string>
-    <string name="transfer_instructions_txt">转账说明</string>
-    <string name="transfer_time_txt">转账时间</string>
-    <string name="get_transfer_time_txt">收款时间</string>
+    <string name="zhuanzhangobject_txt">点击选择赠送对象</string>
+    <string name="zhuanzhangjine_txt">赠送金额</string>
+    <string name="zhuanzhangjineto_txt">赠送给:%s</string>
+    <string name="transfer_instructions_hint_txt">（选填）输入赠送说明</string>
+    <string name="fqzz_txt">发起赠送</string>
+    <string name="no_get_to_back_t_txt">24小时内未收款，赠送金额将被自动领取</string>
+    <string name="timeout_transfer_tips_txt">24小时内未收款，赠送金额将被自动领取</string>
+    <string name="transfer_instructions_txt">赠送说明</string>
+    <string name="transfer_time_txt">赠送时间</string>
+    <string name="get_transfer_time_txt">领取时间</string>
     <string name="collection_transfer_txt">收款</string>
     <string name="refund_transfer_txt">退还</string>
     <string name="hbxq_txt">红包详情</string>
@@ -400,35 +402,35 @@
     <string name="zfmmcw_txt">支付密码错误，请重试</string>
     <string name="hqqbxxsb_txt">获取钱包信息失败</string>
     <string name="send_in_redenvelope_txt2">塞礼品积分进红包</string>
-    <string name="zhuanzhang_txt">[礼品积分转账]</string>
-    <string name="zzjebnwk_txt">转账金额不能为空</string>
+    <string name="zhuanzhang_txt">[礼品积分赠送]</string>
+    <string name="zzjebnwk_txt">赠送金额不能为空</string>
     <string name="zzjebnwk_txt1">收款金额不能为空</string>
 
-    <string name="zzjebnsy_txt">转账金额不能小于0.01</string>
+    <string name="zzjebnsy_txt">赠送金额不能小于0.01</string>
     <string name="zzjebnsy_txt1">收款金额不能为空不能小于0.01</string>
 
     <string name="hqqbxxsb_tx">获取钱包信息失败</string>
-    <string name="nqdythzz_txt">确定要退还转账吗？</string>
-    <string name="nqdythzz_txt1">您确定要退还%s的转账吗？</string>
+    <string name="nqdythzz_txt">确定要退还赠送吗？</string>
+    <string name="nqdythzz_txt1">您确定要退还%s的赠送吗？</string>
     <string name="tuihuan_txt">退还</string>
     <string name="ndqbbdj_txt">您的Cash被冻结，如需解冻请联系客服</string>
     <string name="lxkh_txt">联系客服</string>
-    <string name="zhuanzhang_tips1_txt">1天内对方未收款，转账金额将自动打到收款方的余额</string>
+    <string name="zhuanzhang_tips1_txt">1天内对方未收款，赠送金额将自动打到收款方的余额</string>
     <string name="daishoukuan_txt">待%s收款</string>
     <string name="yishoukuan_txt">%s已收款</string>
-    <string name="yzdsk_txt">%s已自动收款</string>
+    <string name="yzdsk_txt">%s已自动领取</string>
     <string name="yituikuan_txt1">%s已退还</string>
     <string name="yzdtk_txt">%s已自动退还</string>
     <string name="ytkdye_txt">已退还到余额</string>
     <string name="dfwbdsjhytkdye_txt">对方未绑定手机号，已退还到余额</string>
-    <string name="zhuangzhang_tips2_txt">1天内未收款，转账金额将自动打到余额</string>
+    <string name="zhuangzhang_tips2_txt">1天内未收款，赠送金额将自动打到余额</string>
     <string name="dainishoukuan_txt">待你收款</string>
-    <string name="ninyishoukuan_txt">您已收款</string>
-    <string name="niyizdsk_txt">您已自动收款</string>
+    <string name="ninyishoukuan_txt">您已领取</string>
+    <string name="niyizdsk_txt">您已自动领取</string>
     <string name="nyth_txt">已退还</string>
     <string name="ytkddfye_txt">已退还到对方余额</string>
     <string name="wbdsjhytkddfye_txt">系统已自动退还</string>
-    <string name="zhuanzhang_title_txt">转账</string>
+    <string name="zhuanzhang_title_txt">赠送</string>
     <string name="fahongbao_txt">发红包</string>
     <string name="ge_txt">个</string>
     <string name="voom_message_txt">[短影音消息]</string>
@@ -471,26 +473,26 @@
     <string name="weichuli_txt">未处理</string>
     <string name="kefushenhetongguo_txt">客服审核通过</string>
     <string name="yidakuan_txt">已打款</string>
-    <string name="yinbi_tuikuan_txt">礼品积分红包-退款</string>
+    <string name="yinbi_tuikuan_txt">礼品积分红包-退还</string>
     <string name="yinbihongbao_laizi_txt">礼品积分红包-来自</string>
     <string name="yinbihonbao_wofagei_txt">礼品积分红包-我发给</string>
-    <string name="yinbizhuanzhang_tuikuan_txt">礼品积分转账-退款</string>
-    <string name="yinbizhuanzhang_laizi_txt">礼品积分转账-来自</string>
-    <string name="yinbizhuanzhang_wofagei_txt">礼品积分转账-我发给</string>
-    <string name="yinbiqunhongbao_tuikuan_txt">礼品积分群红包-退款</string>
+    <string name="yinbizhuanzhang_tuikuan_txt">礼品积分赠送-退还</string>
+    <string name="yinbizhuanzhang_laizi_txt">礼品积分赠送-来自</string>
+    <string name="yinbizhuanzhang_wofagei_txt">礼品积分赠送-我发给</string>
+    <string name="yinbiqunhongbao_tuikuan_txt">礼品积分群红包-退还</string>
     <string name="yinbiqunhongbao_txt">礼品积分群红包</string>
     <string name="ybqhb_wfg_txt">礼品积分群红包-我发给</string>
     <string name="yinbiqhb_laizi_txt">礼品积分群红包-来自</string>
     <string name="shenqi_topup_txt">發發發充值</string>
     <string name="shenqi_with_txt">發發發提现</string>
     <string name="weizhi_txt">未知</string>
-    <string name="jinbihongbao_tuikuan_txt">Cash红包-退款</string>
+    <string name="jinbihongbao_tuikuan_txt">Cash红包-退还</string>
     <string name="jinbihongbao_laizi_txt">Cash红包-来自</string>
     <string name="jinbihongbao_wfg_txt">Cash红包-我发给</string>
-    <string name="jinbizhuanzhang_tk_txt">Cash转账-退款</string>
-    <string name="jinbizhuanzhang_laizi_txt">Cash转账-来自</string>
-    <string name="jinbizhuanzhang_wofagei_txt">Cash转账-我发给</string>
-    <string name="jinbiqunhongbao_tuikuan_txt">Cash群红包-退款</string>
+    <string name="jinbizhuanzhang_tk_txt">Cash赠送-退还</string>
+    <string name="jinbizhuanzhang_laizi_txt">Cash赠送-来自</string>
+    <string name="jinbizhuanzhang_wofagei_txt">Cash赠送-我发给</string>
+    <string name="jinbiqunhongbao_tuikuan_txt">Cash群红包-退还</string>
     <string name="jinbiqunhongbao_txt">Cash群红包</string>
     <string name="jinbiqunhongbao_wfg_txt">Cash群红包-我发给</string>
     <string name="jinbiqunhb_laizi_txt">Cash群红包-来自</string>
@@ -519,7 +521,7 @@
     <string name="withdrawal_txt">提现</string>
     <string name="youxichongzhi_txt">游戏充值</string>
     <string name="youxitixian_txt">游戏提现</string>
-    <string name="zhuanzhang_txt1">转账</string>
+    <string name="zhuanzhang_txt1">赠送</string>
 
     <string name="addfriends_id">ID</string>
     <string name="addfriends_phone">电话号码</string>
@@ -551,7 +553,7 @@
     <string name="skrkjzdes_txt">收款人可见，最多20个字</string>
     <string name="zhiufuchengg_txt">支付成功</string>
     <string name="zhanghuyue_txt">账户余额</string>
-    <string name="payment_type_txt">付款方式</string>
+    <string name="payment_type_txt">赠送方式</string>
     <string name="shoukuanfang_txt">收款方</string>
     <string name="fukuanbeizhu_txt">付款备注</string>
     <string name="wu_txt">无</string>
@@ -593,7 +595,7 @@
     <string name="erweimashouklaizi_txt">收款-来自</string>
     <string name="erweimashouklaizi_txt1">行动码收款-來自</string>
 
-    <string name="saomafukuan_txt">转账-给</string>
+    <string name="saomafukuan_txt">赠送-给</string>
     <string name="saomafukuan_txt2">行动码付款-给</string>
 
     <string name="join_group_txt">加入群聊</string>
@@ -631,16 +633,16 @@
     <string name="zdxzsg_txt">最多选择三个</string>
     <string name="setting_cleanhistory">聊天记录被清除后无法恢复，确认要继续吗？</string>
     <string name="toast_teamname">请设置群名称</string>
-    <string name="xiangshuijinbi_txt">向 %s Cash转账</string>
-    <string name="xiangshuiyinbi_txt">向 %s 礼品积分转账</string>
-    <string name="xiangshuijinbi_txt1">来自 %s 的Cash转账</string>
-    <string name="xiangshuiyinbi_txt1">来自 %s 的礼品积分转账</string>
+    <string name="xiangshuijinbi_txt">向 %s Cash赠送</string>
+    <string name="xiangshuiyinbi_txt">向 %s 礼品积分赠送</string>
+    <string name="xiangshuijinbi_txt1">来自 %s 的Cash赠送</string>
+    <string name="xiangshuiyinbi_txt1">来自 %s 的礼品积分赠送</string>
     <string name="saoyisao_txt">扫一扫</string>
     <string name="shoukuan_title_txt">收款</string>
     <string name="shoukuanjine_txt">收款金额</string>
     <string name="shoukuanfasong_succ_txt">收款扫码成功</string>
     <string name="zhifuchengong_txt">支付成功</string>
-    <string name="fukuangei_txt">付款给%s</string>
+    <string name="fukuangei_txt">赠送%s</string>
     <string name="wangjimima_txt">忘记密码？</string>
     <string name="qsrndsjhhqyzmzhmm">输入您的手机号获取验证码来找回密码</string>
     <string name="wangjimima_title_txt">忘记密码</string>
@@ -701,7 +703,7 @@
     <string name="genghuancheng_to_login_txt1">密码重置完成，请重新登录账号</string>
     <string name="systemmessage_txt">[系统消息]</string>
     <string name="ps_completed">@string/setting_complete</string>
-    <string name="qxxzzzdx_txt">请先选择转账对象</string>
+    <string name="qxxzzzdx_txt">请先选择赠送对象</string>
     <string name="zfjecgxz_txt">支付业额超过限制，为了您的资金安全，请输入密码支付</string>
     <string name="tcdl_tips_txt1">您的账号在其它设备登录，如非本人操作，那么密码可能泄露，请尽快修改</string>
     <string name="duibiji_txt">兑币机</string>
@@ -800,7 +802,7 @@
     <string name="zhifuzhong_txt1">支付中...</string>
     <string name="dingdanbianhao_txt">订单编号</string>
     <string name="cuzhicashdianshu_txt">储值Cash点数</string>
-    <string name="fukuanfangshi_txt">付款方式</string>
+    <string name="fukuanfangshi_txt">赠送方式</string>
     <string name="zhifushijian_txt">支付时间</string>
     <string name="xinyongka_txt">信用卡</string>
     <string name="zhifushibai_txt">支付失败</string>
@@ -876,6 +878,7 @@
     <string name="dialog_selectcountry_hint">搜索国家或地区</string>
     <string name="tv_checkmore">查看更多 >></string>
     <string name="activitymessage_details">活动详情</string>
-    <string name="cash_paytype">付款方式</string>
+    <string name="cash_paytype">赠送方式</string>
     <string name="cash_paytype_card">信用卡支付</string>
+    <string name="closeaccount_tips_txt">账号注销后您的用户信息将被清空且无法找回，历史交易记录及账户余额等相关权益将视为自动放弃并自动作废</string>
 </resources>

app/src/main/res/values/colors.xml

@@ -94,6 +94,8 @@
     <color name="color_403d51">#403D51</color>
     <color name="color_d4ab90">#D4AB90</color>
     <color name="color_6877fe">#6877FE</color>
+    <color name="color_ff4040">#FF4040</color>
+    <color name="color_ffecec">#FFECEC</color>
 
 
 

app/src/main/res/values/strings.xml

@@ -208,6 +208,8 @@
     <string name="weishezhi_txt">未設定</string>
     <string name="wechat_txt">微信</string>
     <string name="phone_number_txt">手機號碼</string>
+    <string name="close_account_txt">注銷帳號</string>
+    <string name="close_account_confirm_txt">確認註銷</string>
     <string name="accout_password_txt">帳號密碼</string>
     <string name="yibangding_txt">已綁定</string>
     <string name="weibangding_txt">未綁定</string>
@@ -353,16 +355,16 @@
     <string name="send_in_redenvelope_txt1">塞Cash進紅包</string>
     <string name="send_in_redtype_txt1">塞金幣進紅包</string>
     <string name="no_get_to_back_txt">未領取的紅包，將於24小時候退回</string>
-    <string name="zhuanzhangobject_txt">點選選擇轉帳對象</string>
-    <string name="zhuanzhangjine_txt">轉帳金額</string>
-    <string name="zhuanzhangjineto_txt">轉帳給:%s</string>
-    <string name="transfer_instructions_hint_txt">（選填）輸入轉帳說明</string>
-    <string name="fqzz_txt">發起轉帳</string>
-    <string name="no_get_to_back_t_txt">24小時內未收款，轉帳金額將會自動領取</string>
-    <string name="timeout_transfer_tips_txt">24小時內未收款，轉帳金額將會自動領取</string>
-    <string name="transfer_instructions_txt">轉帳說明</string>
-    <string name="transfer_time_txt">轉帳時間</string>
-    <string name="get_transfer_time_txt">收款時間</string>
+    <string name="zhuanzhangobject_txt">點選選擇贈送對象</string>
+    <string name="zhuanzhangjine_txt">贈送金額</string>
+    <string name="zhuanzhangjineto_txt">贈送給:%s</string>
+    <string name="transfer_instructions_hint_txt">（選填）輸入贈送說明</string>
+    <string name="fqzz_txt">發起贈送</string>
+    <string name="no_get_to_back_t_txt">24小時內未收款，贈送金額將會自動領取</string>
+    <string name="timeout_transfer_tips_txt">24小時內未收款，贈送金額將會自動領取</string>
+    <string name="transfer_instructions_txt">贈送說明</string>
+    <string name="transfer_time_txt">贈送時間</string>
+    <string name="get_transfer_time_txt">領取時間</string>
     <string name="collection_transfer_txt">收款</string>
     <string name="refund_transfer_txt">退還</string>
     <string name="hbxq_txt">紅包詳情</string>
@@ -398,35 +400,35 @@
     <string name="zfmmcw_txt">支付密碼錯誤，請重試</string>
     <string name="hqqbxxsb_txt">取得錢包資訊失敗</string>
     <string name="send_in_redenvelope_txt2">塞禮品積分進紅包</string>
-    <string name="zhuanzhang_txt">[禮品積分轉帳]</string>
-    <string name="zzjebnwk_txt">轉帳金額不能為空</string>
+    <string name="zhuanzhang_txt">[禮品積分贈送]</string>
+    <string name="zzjebnwk_txt">贈送金額不能為空</string>
     <string name="zzjebnwk_txt1">收款金額不能為空</string>
 
-    <string name="zzjebnsy_txt">轉帳金額不能小於0.01</string>
+    <string name="zzjebnsy_txt">贈送金額不能小於0.01</string>
     <string name="zzjebnsy_txt1">收款金額不能小於0.01</string>
 
     <string name="hqqbxxsb_tx">取得錢包資訊失敗</string>
-    <string name="nqdythzz_txt">確定要退還轉帳嗎？ </string>
-    <string name="nqdythzz_txt1">您確定要退還%s的轉帳嗎？ </string>
+    <string name="nqdythzz_txt">確定要退還贈送嗎？ </string>
+    <string name="nqdythzz_txt1">您確定要退還%s的贈送嗎？ </string>
     <string name="tuihuan_txt">退還</string>
     <string name="ndqbbdj_txt">您的Cash被凍結，如需解凍請聯絡客服</string>
     <string name="lxkh_txt">聯絡客服</string>
-    <string name="zhuanzhang_tips1_txt">1天內對方未收款，轉帳金額將自動打到收款方的餘額</string>
+    <string name="zhuanzhang_tips1_txt">1天內對方未收款，贈送金額將自動打到收款方的餘額</string>
     <string name="daishoukuan_txt">待%s收款</string>
     <string name="yishoukuan_txt">%s已收款</string>
-    <string name="yzdsk_txt">%s已自動收款</string>
-    <string name="yituikuan_txt1">%s已退款</string>
-    <string name="yzdtk_txt">%s已自動退款</string>
-    <string name="ytkdye_txt">已退款至餘額</string>
-    <string name="dfwbdsjhytkdye_txt">對方未綁定手機號，已退款到餘額</string>
-    <string name="zhuangzhang_tips2_txt">1天內未收款，轉帳金額將自動打到餘額</string>
+    <string name="yzdsk_txt">%s已自動領取</string>
+    <string name="yituikuan_txt1">%s已退還</string>
+    <string name="yzdtk_txt">%s已自動退還</string>
+    <string name="ytkdye_txt">已退還至餘額</string>
+    <string name="dfwbdsjhytkdye_txt">對方未綁定手機號，已退還到餘額</string>
+    <string name="zhuangzhang_tips2_txt">1天內未收款，贈送金額將自動打到餘額</string>
     <string name="dainishoukuan_txt">待你收款</string>
-    <string name="ninyishoukuan_txt">您已收款</string>
-    <string name="niyizdsk_txt">您已自動收款</string>
+    <string name="ninyishoukuan_txt">您已領取</string>
+    <string name="niyizdsk_txt">您已自動領取</string>
     <string name="nyth_txt">您已退還</string>
-    <string name="ytkddfye_txt">已退款至對方餘額</string>
+    <string name="ytkddfye_txt">已退還至對方餘額</string>
     <string name="wbdsjhytkddfye_txt">系統已自動退還</string>
-    <string name="zhuanzhang_title_txt">轉帳</string>
+    <string name="zhuanzhang_title_txt">贈送</string>
     <string name="fahongbao_txt">發紅包</string>
     <string name="ge_txt">個</string>
     <string name="voom_message_txt">[短影音訊息]</string>
@@ -435,7 +437,7 @@
     <string name="baocunshoukuanma_txt">保存收款碼</string>
     <string name="shoukuanma_txt">收款碼</string>
     <string name="fukuanma_txt">付款碼</string>
-    <string name="change_pay_type_txt">切換付款方式</string>
+    <string name="change_pay_type_txt">切換赠送方式</string>
     <string name="neweb_txt">藍新</string>
     <string name="yue_pay_txt">（餘額：%.2f）</string>
     <string name="fukuan_txt">付款</string>
@@ -470,26 +472,26 @@
     <string name="weichuli_txt">未處理</string>
     <string name="kefushenhetongguo_txt">客服審核通過</string>
     <string name="yidakuan_txt">已打款</string>
-    <string name="yinbi_tuikuan_txt">禮品積分紅包-退款</string>
+    <string name="yinbi_tuikuan_txt">禮品積分紅包-退還</string>
     <string name="yinbihongbao_laizi_txt">禮品積分紅包-來自</string>
     <string name="yinbihonbao_wofagei_txt">禮品積分紅包-我發給</string>
-    <string name="yinbizhuanzhang_tuikuan_txt">禮品積分轉帳-退款</string>
-    <string name="yinbizhuanzhang_laizi_txt">禮品積分轉帳-來自</string>
-    <string name="yinbizhuanzhang_wofagei_txt">禮品積分轉帳-我發給</string>
-    <string name="yinbiqunhongbao_tuikuan_txt">禮品積分群紅包-退款</string>
+    <string name="yinbizhuanzhang_tuikuan_txt">禮品積分贈送-退還</string>
+    <string name="yinbizhuanzhang_laizi_txt">禮品積分贈送-來自</string>
+    <string name="yinbizhuanzhang_wofagei_txt">禮品積分贈送-我發給</string>
+    <string name="yinbiqunhongbao_tuikuan_txt">禮品積分群紅包-退還</string>
     <string name="yinbiqunhongbao_txt">禮品積分群紅包</string>
     <string name="ybqhb_wfg_txt">禮品積分群紅包-我發給</string>
     <string name="yinbiqhb_laizi_txt">禮品積分群紅包-來自</string>
     <string name="shenqi_topup_txt">發發充值</string>
     <string name="shenqi_with_txt">發發提現</string>
     <string name="weizhi_txt">未知</string>
-    <string name="jinbihongbao_tuikuan_txt">Cash紅包-退款</string>
+    <string name="jinbihongbao_tuikuan_txt">Cash紅包-退還</string>
     <string name="jinbihongbao_laizi_txt">Cash紅包-來自</string>
     <string name="jinbihongbao_wfg_txt">Cash紅包-我發給</string>
-    <string name="jinbizhuanzhang_tk_txt">Cash轉帳-退款</string>
-    <string name="jinbizhuanzhang_laizi_txt">Cash轉帳-來自</string>
-    <string name="jinbizhuanzhang_wofagei_txt">Cash轉帳-我發給</string>
-    <string name="jinbiqunhongbao_tuikuan_txt">Cash群紅包-退款</string>
+    <string name="jinbizhuanzhang_tk_txt">Cash贈送-退還</string>
+    <string name="jinbizhuanzhang_laizi_txt">Cash贈送-來自</string>
+    <string name="jinbizhuanzhang_wofagei_txt">Cash贈送-我發給</string>
+    <string name="jinbiqunhongbao_tuikuan_txt">Cash群紅包-退還</string>
     <string name="jinbiqunhongbao_txt">Cash群紅包</string>
     <string name="jinbiqunhongbao_wfg_txt">Cash群紅包-我發給</string>
     <string name="jinbiqunhb_laizi_txt">Cash群紅包-來自</string>
@@ -518,7 +520,7 @@
     <string name="withdrawal_txt">提現</string>
     <string name="youxichongzhi_txt">遊戲儲值</string>
     <string name="youxitixian_txt">遊戲提現</string>
-    <string name="zhuanzhang_txt1">轉帳</string>
+    <string name="zhuanzhang_txt1">贈送</string>
 
     <string name="addfriends_id">ID</string>
     <string name="addfriends_phone">電話號碼</string>
@@ -560,7 +562,7 @@
     <string name="skrkjzdes_txt">收款人可見，最多20個字</string>
     <string name="zhiufuchengg_txt">付款成功</string>
     <string name="zhanghuyue_txt">帳戶餘額</string>
-    <string name="payment_type_txt">付款方式</string>
+    <string name="payment_type_txt">贈送方式</string>
     <string name="shoukuanfang_txt">收款方</string>
     <string name="fukuanbeizhu_txt">付款備註</string>
 
@@ -633,16 +635,16 @@
     <string name="qxxzjbyy_txt">請先選擇檢舉原因</string>
     <string name="qxtxjtqksm_txt">請先填入具體情況說明</string>
     <string name="zdxzsg_txt">最多選三</string>
-    <string name="xiangshuijinbi_txt">轉帳至 %s Cash</string>
-    <string name="xiangshuiyinbi_txt">轉帳至 %s 禮品積分</string>
-    <string name="xiangshuijinbi_txt1">來自 %s 的Cash轉帳</string>
-    <string name="xiangshuiyinbi_txt1">來自 %s 的禮品積分轉帳</string>
+    <string name="xiangshuijinbi_txt">贈送至 %s Cash</string>
+    <string name="xiangshuiyinbi_txt">贈送至 %s 禮品積分</string>
+    <string name="xiangshuijinbi_txt1">來自 %s 的Cash贈送</string>
+    <string name="xiangshuiyinbi_txt1">來自 %s 的禮品積分贈送</string>
     <string name="saoyisao_txt">掃一掃</string>
     <string name="shoukuan_title_txt">收款</string>
     <string name="shoukuanjine_txt">收款金額</string>
     <string name="shoukuanfasong_succ_txt">收款掃碼成功</string>
     <string name="zhifuchengong_txt">支付成功</string>
-    <string name="fukuangei_txt">付款给%s</string>
+    <string name="fukuangei_txt">贈送%s</string>
     <string name="wangjimima_txt">忘記密碼？</string>
     <string name="qsrndsjhhqyzmzhmm">輸入您的手機號獲取驗證碼來找回密碼</string>
     <string name="wangjimima_title_txt">忘記密碼</string>
@@ -704,7 +706,7 @@
     <string name="genghuancheng_to_login_txt1">密碼重置完成，請重新登入帳號</string>
     <string name="systemmessage_txt">[系統訊息]</string>
     <string name="ps_completed">@string/setting_complete</string>
-    <string name="qxxzzzdx_txt">請先選擇轉帳對象</string>
+    <string name="qxxzzzdx_txt">請先選擇贈送對象</string>
     <string name="zfjecgxz_txt">支付業額超過限制，為了您的資金安全，請輸入密碼支付</string>
     <string name="tcdl_tips_txt1">您的帳號在其它設備登入，如非本人操作，那麼密碼可能洩露，請儘快修改</string>
     <string name="duibiji_txt">兌幣機</string>
@@ -804,7 +806,7 @@
     <string name="zhifuzhong_txt1">支付中...</string>
     <string name="dingdanbianhao_txt">訂單編號</string>
     <string name="cuzhicashdianshu_txt">儲值Cash點數</string>
-    <string name="fukuanfangshi_txt">付款方式</string>
+    <string name="fukuanfangshi_txt">贈送方式</string>
     <string name="zhifushijian_txt">支付时间</string>
     <string name="xinyongka_txt">信用卡</string>
     <string name="zhifushibai_txt">支付失敗</string>
@@ -883,8 +885,8 @@
     <string name="dialog_selectcountry_hint">搜尋國家或地區</string>
     <string name="tv_checkmore">查看更多 >></string>
     <string name="activitymessage_details">活動詳情</string>
-    <string name="cash_paytype">付款方式</string>
+    <string name="cash_paytype">贈送方式</string>
     <string name="cash_paytype_card">信用卡支付</string>
-
+    <string name="closeaccount_tips_txt">帳號註銷後您的用戶資訊將被清空且無法找回，歷史交易記錄及帳戶餘額等相關權益將視為自動放棄並自動作廢</string>
 
 </resources>