钱包UI界面的修改

jixin/src/main/AndroidManifest.xml

@@ -332,7 +332,7 @@
         <activity android:name=".ui.me.redpacket.RedListActivity" />
         <activity android:name=".ui.me.redpacket.SendRedPacketActivity" />
         <activity android:name=".ui.me.redpacket.WxPayAdd" />
-        <activity android:name=".ui.me.redpacket.WxPayBlance" />
+        <activity android:name=".ui.me.redpacket.JunYouWalletActivity" />
         <activity android:name=".ui.me.sendgroupmessage.ChatActivityForSendGroup" /> <!-- 收付款、转账 -->
         <activity
             android:name=".pay.sk.SKPayActivity"

jixin/src/main/java/com/jixin/im/fragment/MeFragment.java

@@ -32,7 +32,7 @@ import com.jixin.im.ui.me.MyCollection;
 import com.jixin.im.ui.me.MyGold;
 import com.jixin.im.ui.me.OfferApplyActivity;
 import com.jixin.im.ui.me.SettingActivity;
-import com.jixin.im.ui.me.redpacket.WxPayBlance;
+import com.jixin.im.ui.me.redpacket.JunYouWalletActivity;
 import com.jixin.im.ui.tool.SingleImagePreviewActivity;
 import com.jixin.im.ui.tool.WebViewActivity;
 import com.jixin.im.util.SkinUtils;
@@ -225,7 +225,7 @@ public class MeFragment extends EasyFragment implements View.OnClickListener {
 
             case R.id.my_monry:
                 // 我的钱包
-                startActivity(new Intent(getActivity(), WxPayBlance.class));
+                startActivity(new Intent(getActivity(), JunYouWalletActivity.class));
                 break;
             case R.id.my_space_rl:
                 // 我的动态

jixin/src/main/java/com/jixin/im/fragment/MeFragment2.java

@@ -14,12 +14,10 @@ import android.net.Uri;
 import android.os.Bundle;
 import android.text.TextUtils;
 import android.util.Log;
-import android.view.Display;
 import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.Window;
-import android.view.WindowManager;
 import android.widget.ImageView;
 import android.widget.ProgressBar;
 import android.widget.RelativeLayout;
@@ -51,7 +49,6 @@ import com.jixin.im.ui.circle.range.SendAudioActivity;
 import com.jixin.im.ui.circle.range.SendFileActivity;
 import com.jixin.im.ui.circle.range.SendShuoshuoActivity;
 import com.jixin.im.ui.circle.range.SendVideoActivity;
-import com.jixin.im.ui.dialog.ShareFriendsDialog;
 import com.jixin.im.ui.groupchat.SelectContactsActivity;
 import com.jixin.im.ui.me.AboutActivity;
 import com.jixin.im.ui.me.BasicInfoEditActivity;
@@ -68,7 +65,7 @@ import com.jixin.im.ui.me.bubble.HelpCenterActivity;
 import com.jixin.im.ui.me.bubble.ShareFriendsActivity;
 import com.jixin.im.ui.me.bubble.VipDetailsActivity;
 import com.jixin.im.ui.me.redpacket.WxPayAdd;
-import com.jixin.im.ui.me.redpacket.WxPayBlance;
+import com.jixin.im.ui.me.redpacket.JunYouWalletActivity;
 import com.jixin.im.ui.message.ChatActivity;
 import com.jixin.im.ui.message.ChatActivityTemp;
 import com.jixin.im.ui.tool.WebViewActivity;
@@ -409,7 +406,7 @@ public class MeFragment2 extends EasyFragment implements View.OnClickListener {
 
             case R.id.my_monry:
                 // 我的钱包
-                startActivity(new Intent(getActivity(), WxPayBlance.class));
+                startActivity(new Intent(getActivity(), JunYouWalletActivity.class));
                 break;
             case R.id.my_space_rl:
                 // 我的动态
@@ -485,7 +482,7 @@ public class MeFragment2 extends EasyFragment implements View.OnClickListener {
                 break;
             case R.id.shangcheng:
                 //俊友钱包
-                startActivity(new Intent(getActivity(), WxPayBlance.class));
+                startActivity(new Intent(getActivity(), JunYouWalletActivity.class));
                 break;
             case R.id.tv_mywallet:
                 //俊友客服

jixin/src/main/java/com/jixin/im/pay/TransferMoneyDetailActivity.java

@@ -20,7 +20,7 @@ import com.jixin.im.bean.message.ChatMessage;
 import com.jixin.im.db.dao.FriendDao;
 import com.jixin.im.ui.base.BaseActivity;
 import com.jixin.im.ui.base.CoreManager;
-import com.jixin.im.ui.me.redpacket.WxPayBlance;
+import com.jixin.im.ui.me.redpacket.JunYouWalletActivity;
 import com.jixin.im.ui.tool.ButtonColorChange;
 import com.jixin.im.util.TimeUtils;
 import com.xuan.xuanhttplibrary.okhttp.HttpUtils;
@@ -142,7 +142,7 @@ public class TransferMoneyDetailActivity extends BaseActivity {
                 return;
             }
             // 查看零钱
-            startActivity(new Intent(mContext, WxPayBlance.class));
+            startActivity(new Intent(mContext, JunYouWalletActivity.class));
         });
 
         mTransferSureBtn.setOnClickListener(v -> acceptTransfer(coreManager.getSelfStatus().accessToken, mTransfer.getId()));

jixin/src/main/java/com/jixin/im/ui/base/BaseLoginActivity.java

@@ -79,4 +79,6 @@ public abstract class BaseLoginActivity extends ActionBackActivity implements Co
         super.onDestroy();
     }
 
+
+
 }

jixin/src/main/java/com/jixin/im/ui/me/redpacket/WxPayBlance.java

@@ -8,6 +8,7 @@ import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import com.j256.ormlite.stmt.query.In;
 import com.jixin.RetrofitUtil.RetrofitUtils;
 import com.jixin.im.MyApplication;
 import com.jixin.im.R;
@@ -17,9 +18,12 @@ import com.jixin.im.helper.LoginSecureHelper;
 import com.jixin.im.ui.base.BaseActivity;
 import com.jixin.im.ui.me.TiXianActivityNew;
 import com.jixin.im.ui.tool.ButtonColorChange;
+import com.jixin.im.util.Constants;
 import com.jixin.im.util.EventBusHelper;
+import com.jixin.im.util.PreferenceUtils;
 import com.jixin.im.util.SkinUtils;
 import com.jixin.im.util.ToastUtil;
+import com.jixin.im.view.SkinTextView;
 import com.xuan.xuanhttplibrary.okhttp.HttpUtils;
 import com.xuan.xuanhttplibrary.okhttp.callback.BaseCallback;
 import com.xuan.xuanhttplibrary.okhttp.result.ObjectResult;
@@ -39,7 +43,12 @@ import okhttp3.ResponseBody;
 import retrofit2.Callback;
 import retrofit2.Response;
 
-public class WxPayBlance extends BaseActivity {
+
+/**
+ * 俊友钱包
+ * Modify by Harvey on 2020/09/23
+ */
+public class JunYouWalletActivity extends BaseActivity {
 
     public static final String RSA_PRIVATE = "";
     private static final int SDK_PAY_FLAG = 1;
@@ -47,11 +56,13 @@ public class WxPayBlance extends BaseActivity {
     private TextView mBalanceTv;
     private TextView mRechargeTv;
     private TextView mWithdrawTv;
+    private TextView tvBindAlipay;
+    private TextView tvSetPayPwd;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_wx_pay_blance);
+        setContentView(R.layout.activity_junyou_wallet);
         initActionBar();
         initView();
         EventBusHelper.register(this);
@@ -66,59 +77,69 @@ public class WxPayBlance extends BaseActivity {
 
     private void initActionBar() {
         getSupportActionBar().hide();
-        findViewById(R.id.iv_title_left).setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                finish();
-            }
+        findViewById(R.id.iv_title_left).setOnClickListener(v -> {
+            finish();
         });
-        TextView mTvTitle = (TextView) findViewById(R.id.tv_title_center);
-        mTvTitle.setText(getString(R.string.my_purse));
-        ImageView mImageView = findViewById(R.id.iv_title_right);
-        mImageView.setImageDrawable(getResources().getDrawable(R.mipmap.navigation));
-        mImageView.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                // 访问接口 获取记录
-                Intent intent = new Intent(WxPayBlance.this, PaymentCenterActivity.class);
-                startActivity(intent);
-            }
+        SkinTextView tvTitleRight = findViewById(R.id.tv_title_right);
+        tvTitleRight.setVisibility(View.VISIBLE);
+        tvTitleRight.setText(R.string.bill);
+        tvTitleRight.setOnClickListener(v -> {
+            //账单
+            startActivity(new Intent(this, MyConsumeRecord.class));
         });
+        TextView mTvTitle = findViewById(R.id.tv_title_center);
+        mTvTitle.setText(getString(R.string.my_purse));
+//        ImageView mImageView = findViewById(R.id.iv_title_right);
+//        mImageView.setImageDrawable(getResources().getDrawable(R.mipmap.navigation));
+//        mImageView.setOnClickListener(new View.OnClickListener() {
+//            @Override
+//            public void onClick(View v) {
+//                // 访问接口 获取记录
+//                Intent intent = new Intent(JunYouWalletActivity.this, PaymentCenterActivity.class);
+//                startActivity(intent);
+//            }
+//        });
     }
 
     private void initView() {
-        mBalanceTv = (TextView) findViewById(R.id.myblance);
-        mRechargeTv = (TextView) findViewById(R.id.chongzhi);
-        mWithdrawTv = (TextView) findViewById(R.id.quxian);
-        ButtonColorChange.rechargeChange(this, mWithdrawTv, R.drawable.recharge_icon);
-        ButtonColorChange.rechargeChange(this, mRechargeTv, R.drawable.chongzhi_icon);
-        mWithdrawTv.setTextColor(SkinUtils.getSkin(this).getAccentColor());
-
-        mRechargeTv.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                Intent intent = new Intent(WxPayBlance.this, WxPayAdd.class);
+        mBalanceTv = findViewById(R.id.tv_wallet_balance);
+        mRechargeTv = findViewById(R.id.tv_recharge);
+        mWithdrawTv = findViewById(R.id.tv_wallet_withdraw);
+        tvBindAlipay = findViewById(R.id.tv_bind_alipay);
+
+        tvSetPayPwd = findViewById(R.id.tv_set_pay_pwd);
+        if (hasPayPassword()){
+            tvSetPayPwd.setText(R.string.have_set);
+        }else{
+            tvSetPayPwd.setText(R.string.not_set);
+        }
+        tvSetPayPwd.setOnClickListener(v -> {
+            //设置支付密码
+            if (!hasPayPassword()){
+                Intent intent = new Intent(JunYouWalletActivity.this, ChangePayPasswordActivity.class);
                 startActivity(intent);
             }
         });
 
-        mWithdrawTv.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                // 提款
-                startActivity(new Intent(WxPayBlance.this, TiXianActivityNew.class));
-//                Intent intent = new Intent(WxPayBlance.this, QuXianActivity.class);
-//                startActivity(intent);
-            }
+        mRechargeTv.setOnClickListener(v -> {
+            //充值
+            Intent intent = new Intent(JunYouWalletActivity.this, WxPayAdd.class);
+            startActivity(intent);
         });
 
-        findViewById(R.id.tvPayPassword).setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                Intent intent = new Intent(WxPayBlance.this, ChangePayPasswordActivity.class);
-                startActivity(intent);
-            }
+        mWithdrawTv.setOnClickListener(v -> {
+            //提现
+            startActivity(new Intent(JunYouWalletActivity.this, TiXianActivityNew.class));
+        });
+
+        tvBindAlipay = findViewById(R.id.tv_bind_alipay);
+        tvBindAlipay.setOnClickListener(v -> {
+            //todo 需要对支付宝的判断
+
+
         });
+
+
     }
 
     private void initData() {
@@ -137,14 +158,16 @@ public class WxPayBlance extends BaseActivity {
                             Balance balance = result.getData();
                             coreManager.getSelf().setBalance(Double.parseDouble(decimalFormat.format(balance.getBalance())));
 
+
+
                         } else {
-                            ToastUtil.showErrorData(WxPayBlance.this);
+                            ToastUtil.showErrorData(JunYouWalletActivity.this);
                         }
                     }
 
                     @Override
                     public void onError(Call call, Exception e) {
-                        ToastUtil.showNetError(WxPayBlance.this);
+                        ToastUtil.showNetError(JunYouWalletActivity.this);
                     }
                 });
         getCoinInfo();
@@ -157,6 +180,11 @@ public class WxPayBlance extends BaseActivity {
         }
     }
 
+    private boolean hasPayPassword(){
+        boolean hasPayPassword = PreferenceUtils.getBoolean(this, Constants.IS_PAY_PASSWORD_SET + coreManager.getSelf().getUserId(), false);
+        return hasPayPassword;
+    }
+
     private void getCoinInfo() {
         HashMap<String, String> map = new HashMap<>();
         String language = Locale.getDefault().getLanguage();

jixin/src/main/res/drawable/shape_recharge_bg_blue_radius_16.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <corners android:radius="16dp"/>
+    <solid android:color="#2a86ff"/>
+
+</shape>

jixin/src/main/res/drawable/shape_withdraw_bg_gray_radius_16.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <corners android:radius="16dp"/>
+    <solid android:color="#ebebeb"/>
+
+</shape>

jixin/src/main/res/layout/activity_junyou_wallet.xml

@@ -0,0 +1,122 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:background="@color/white"
+    android:gravity="center_horizontal"
+    android:orientation="vertical">
+
+    <include
+        layout="@layout/a_view_actionbar"/>
+
+
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="100dp"
+        android:gravity="center"
+        android:text="@string/my_wallet_balance"
+        android:drawableStart="@mipmap/icon_junyou_wallet"
+        android:textColor="#333333"
+        android:textSize="17sp" />
+
+    <TextView
+        android:id="@+id/tv_wallet_balance"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="23dp"
+        android:text=""
+        android:textColor="#333333"
+        android:textSize="30sp"
+        android:textStyle="bold" />
+
+    <TextView
+        android:id="@+id/tv_recharge"
+        android:layout_width="186dp"
+        android:layout_height="32dp"
+        android:layout_marginLeft="20dp"
+        android:layout_marginRight="20dp"
+        android:layout_marginTop="100dp"
+        android:background="@drawable/shape_recharge_bg_blue_radius_16"
+        android:gravity="center"
+        android:text="@string/recharge"
+        android:textColor="@color/white"
+        android:textSize="@dimen/one_level_title" />
+
+    <TextView
+        android:id="@+id/tv_wallet_withdraw"
+        android:layout_width="186dp"
+        android:layout_height="32dp"
+
+        android:background="@drawable/shape_withdraw_bg_gray_radius_16"
+        android:gravity="center"
+        android:text="@string/withdraw"
+        android:textColor="#2A86FF"
+        android:layout_marginTop="12dp"
+        android:textSize="@dimen/one_level_title" />
+
+   <LinearLayout
+       android:layout_margin="15dp"
+       android:layout_width="match_parent"
+       android:orientation="vertical"
+       android:gravity="center"
+       android:layout_height="match_parent">
+       <androidx.constraintlayout.widget.ConstraintLayout
+           android:layout_width="match_parent"
+
+           android:layout_height="wrap_content">
+           <TextView
+               app:layout_constraintStart_toStartOf="parent"
+               app:layout_constraintTop_toTopOf="parent"
+               android:layout_width="wrap_content"
+               android:text="@string/bind_alipay"
+               android:id="@+id/tv_alipay"
+               android:textColor="#333333"
+               android:layout_height="wrap_content"/>
+           <TextView
+               android:id="@+id/tv_bind_alipay"
+               app:layout_constraintEnd_toEndOf="parent"
+               app:layout_constraintTop_toTopOf="parent"
+               android:text="@string/banded"
+               android:textSize="13sp"
+               android:layout_width="0dp"
+               app:layout_constraintStart_toEndOf="@+id/tv_alipay"
+               android:layout_marginStart="10dp"
+               android:gravity="center_vertical|right"
+               android:drawableRight="@mipmap/right_arrow_icon"
+               android:layout_height="wrap_content"/>
+
+       </androidx.constraintlayout.widget.ConstraintLayout>
+
+       <androidx.constraintlayout.widget.ConstraintLayout
+           android:layout_width="match_parent"
+           android:layout_marginTop="12dp"
+           android:layout_height="wrap_content">
+           <TextView
+               android:id="@+id/tv_pay_pwd"
+               app:layout_constraintStart_toStartOf="parent"
+               app:layout_constraintTop_toTopOf="parent"
+               android:layout_width="wrap_content"
+               android:text="@string/pay_password"
+               android:textColor="#333333"
+               android:layout_height="wrap_content"/>
+           <TextView
+               android:id="@+id/tv_set_pay_pwd"
+               app:layout_constraintStart_toEndOf="@+id/tv_pay_pwd"
+               app:layout_constraintEnd_toEndOf="parent"
+               app:layout_constraintTop_toTopOf="parent"
+               android:layout_width="0dp"
+               android:layout_marginStart="10dp"
+               android:text="@string/have_set"
+               android:textSize="13sp"
+               android:gravity="center_vertical|right"
+               android:drawableRight="@mipmap/right_arrow_icon"
+               android:layout_height="wrap_content"/>
+
+       </androidx.constraintlayout.widget.ConstraintLayout>
+
+   </LinearLayout>
+
+</LinearLayout>

jixin/src/main/res/layout/activity_wx_pay_blance.xml

@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/white"
-    android:gravity="center_horizontal"
-    android:orientation="vertical">
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="50dp"
-        android:layout_marginTop="24dp"
-        android:background="@color/white">
-
-        <ImageView
-            android:id="@+id/iv_title_left"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:paddingLeft="15dp"
-            android:paddingTop="10dp"
-            android:paddingRight="10dp"
-            android:paddingBottom="10dp"
-            android:src="@mipmap/return_icon" />
-
-        <TextView
-            android:id="@+id/tv_title_center"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerInParent="true"
-            android:ellipsize="middle"
-            android:maxWidth="200dp"
-            android:singleLine="true"
-            android:text=""
-            android:textColor="@color/black"
-            android:textSize="@dimen/title_center_text_size" />
-
-        <ImageView
-            android:id="@+id/iv_title_right"
-            android:layout_width="35dp"
-            android:layout_height="35dp"
-            android:layout_alignParentRight="true"
-            android:layout_centerVertical="true"
-            android:layout_marginRight="@dimen/dp15"
-            android:paddingLeft="15dp"
-            android:paddingTop="10dp"
-            android:paddingBottom="10dp"
-            android:src="@mipmap/navigation" />
-    </RelativeLayout>
-
-    <ImageView
-        android:id="@+id/imageView"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="50dp"
-        android:src="@drawable/weixinpayyue"
-        android:visibility="gone" />
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="100dp"
-        android:text="@string/my_change"
-        android:textColor="@color/color_black"
-        android:textSize="18sp" />
-
-    <TextView
-        android:id="@+id/myblance"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="23dp"
-        android:text=""
-        android:textColor="@color/color_black"
-        android:textSize="30sp"
-        android:textStyle="bold" />
-
-    <TextView
-        android:id="@+id/chongzhi"
-        android:layout_width="match_parent"
-        android:layout_height="40dp"
-        android:layout_marginLeft="20dp"
-        android:layout_marginRight="20dp"
-        android:layout_marginTop="60dp"
-        android:background="@drawable/weixin_text_yuanjiao_xuanzheqi"
-        android:gravity="center"
-        android:text="@string/recharge"
-        android:textColor="@color/white"
-        android:textSize="@dimen/one_level_title" />
-
-    <TextView
-        android:id="@+id/quxian"
-        android:layout_width="match_parent"
-        android:layout_height="40dp"
-        android:layout_marginLeft="20dp"
-        android:layout_marginRight="20dp"
-        android:layout_marginTop="20dp"
-        android:background="@drawable/weixin_text_yuanjiao_white_zx"
-        android:gravity="center"
-        android:text="@string/withdraw"
-        android:textColor="@color/color_black"
-        android:textSize="@dimen/one_level_title" />
-
-    <TextView
-        android:id="@+id/tvPayPassword"
-        android:layout_width="match_parent"
-        android:layout_height="40dp"
-        android:layout_marginLeft="20dp"
-        android:layout_marginRight="20dp"
-        android:layout_marginTop="20dp"
-        android:background="@drawable/weixin_text_yuanjiao_white_xuanzheqi"
-        android:gravity="center"
-        android:text="@string/btn_change_pay_password"
-        android:textColor="@color/color_black"
-        android:textSize="@dimen/one_level_title"
-        android:visibility="gone" />
-
-</LinearLayout>

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

@@ -2353,6 +2353,16 @@
 
     <string name="send_red_packet_1">发送红包</string>
     <string name="send_group_red_packet">发送群红包</string>
+
+
+    <!-- 俊友钱包 add by Harvey on 2020/09/23    start -->
+    <string name="my_wallet_balance">我的余额</string>
+    <string name="pay_password">支付密码</string>
+    <string name="bind_alipay">绑定支付宝</string>
+    <string name="not_set">未设置</string>
+    <string name="have_set">已设置</string>
+
+    <!-- 俊友钱包 end -->
     <string-array name="icons">
         <item>iphone</item>
         <item>iphone</item>