俊友币充值

build.gradle

@@ -11,7 +11,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.3'
+        classpath 'com.android.tools.build:gradle:4.0.0'
 //        classpath 'com.google.gms:google-services:4.2.0'
     }
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Mon Jun 22 11:10:04 CST 2020
+#Thu Oct 01 10:26:12 CST 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip

jixin/src/main/AndroidManifest.xml

@@ -93,7 +93,8 @@
         android:usesCleartextTraffic="true"
         tools:ignore="GoogleAppIndexingWarning"
         tools:replace="android:name, android:icon, android:roundIcon">
-        <activity android:name=".ui.me.RenewalVipActivity"></activity>
+        <activity android:name=".ui.me.JunYouCoinRechargeActivity"/>
+        <activity android:name=".ui.me.RenewalVipActivity" />
         <activity android:name=".ui.me.VipSettingsActivity" />
         <activity android:name=".ui.me.VipCenterActivity" />
         <activity android:name=".ui.account.AccountDetailsActivity" />

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

@@ -263,7 +263,7 @@ public abstract class BaseRedPacketFragment extends EasyFragment {
     protected abstract HashMap<String, String> getSendRedPacketParameters();
 
 
-    private void sendRedPacket(final String type, String pMoney, String count, final String words, String payPassword) {
+    private void sendRedPacket(final String type, String pMoney, String count, String words, String payPassword) {
         if (!coreManager.isLogin()) {
             return;
         }
@@ -277,6 +277,11 @@ public abstract class BaseRedPacketFragment extends EasyFragment {
         if (params==null){
             params = new HashMap<>();
         }
+
+        if (TextUtils.isEmpty(words)){
+            words = "恭喜发财，大吉大利！";
+
+        }
 //        params.put("access_token", coreManager.getSelfStatus().accessToken);
         params.put("moneyStr", pMoney);
         params.put("greetings", words);
@@ -289,7 +294,7 @@ public abstract class BaseRedPacketFragment extends EasyFragment {
         }
 
 
-
+        String finalWords = words;
         PaySecureHelper.generateParam(
                 getActivity(), payPassword, params,
                 "" + type + pMoney + count + words + mRedPacketAcceptorId,
@@ -316,7 +321,7 @@ public abstract class BaseRedPacketFragment extends EasyFragment {
                                         message.setType(XmppMessage.TYPE_RED);
                                         message.setFromUserId(coreManager.getSelf().getUserId());
                                         message.setFromUserName(coreManager.getSelf().getNickName());
-                                        message.setContent(words); // 祝福语
+                                        message.setContent(finalWords); // 祝福语
                                         message.setFilePath(type); // 用FilePath来储存红包类型
                                         message.setFileSize(redPacket.getStatus()); //用filesize来储存红包状态
                                         if (mRedPacketType==4){

jixin/src/main/java/com/jixin/im/ui/me/JunYouCoinActivity.java

@@ -78,7 +78,7 @@ public class JunYouCoinActivity extends BaseActivity implements View.OnClickList
     public void onClick(View v) {
         switch (v.getId()){
             case R.id.tv_recharge_jun_you:      //充值
-                ToastUtil.showToast(getApplicationContext(),"开发中...");
+                startActivity(new Intent(this,JunYouCoinRechargeActivity.class ));
                 break;
             case R.id.tv_coin_withdraw:         //提现
                 startActivity(new Intent(this,WalletWithdrawActivity.class));

jixin/src/main/java/com/jixin/im/ui/me/JunYouCoinRechargeActivity.java

@@ -0,0 +1,116 @@
+package com.jixin.im.ui.me;
+
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import com.chad.library.adapter.base.BaseQuickAdapter;
+import com.chad.library.adapter.base.BaseViewHolder;
+import com.jixin.im.R;
+import com.jixin.im.ui.base.BaseActivity;
+import com.jixin.im.util.StringUtils;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class JunYouCoinRechargeActivity extends BaseActivity {
+
+    private RecyclerView mRecyclerViewRecharge;
+    private RechargeAdapter mRechargeAdapter;
+    private TextView mJunYouBalanceTv;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_jun_you_coin_recharge);
+        initActionBar();
+        mRecyclerViewRecharge = findViewById(R.id.recycler_view_recharge);
+        initRecyclerView();
+        test();
+
+
+    }
+
+    private void initRecyclerView() {
+        mRechargeAdapter = new RechargeAdapter();
+        View headerView = LayoutInflater.from(this).inflate(R.layout.head_excharge, null);
+        mJunYouBalanceTv = headerView.findViewById(R.id.tv_jun_you_balance);
+        mRechargeAdapter.setHeaderView(headerView);
+        GridLayoutManager gridLayoutManager = new GridLayoutManager(this, 3);
+        mRecyclerViewRecharge.setLayoutManager(gridLayoutManager);
+        mRecyclerViewRecharge.setAdapter(mRechargeAdapter);
+        mRechargeAdapter.bindToRecyclerView(mRecyclerViewRecharge);
+        mRechargeAdapter.setOnItemClickListener((adapter, view, position) -> {
+                    mRechargeAdapter.mSelectedPosition= position;
+            mRechargeAdapter.notifyDataSetChanged();
+
+                }
+        );
+
+    }
+    private void setItemView(View itemView,boolean isSelected){
+        if (itemView!=null){
+            View bgView = itemView.findViewById(R.id.ll_jun_you);
+            bgView.setBackgroundResource(isSelected?R.mipmap.img_bg_green_radius_15:R.mipmap.img_bg_frame_white_radius_15);
+            mRechargeAdapter.notifyDataSetChanged();
+
+        }
+
+    }
+
+
+    private void initActionBar() {
+        getSupportActionBar().hide();
+        findViewById(R.id.iv_title_left).setOnClickListener(v -> finish());
+        TextView tvTitle = (TextView) findViewById(R.id.tv_title_center);
+        tvTitle.setText("购买");
+
+    }
+
+    private void test() {
+        List<Object> list = new ArrayList<>();
+        for (int index = 0; index < 10; index++) {
+            list.add(new Object());
+        }
+        mRechargeAdapter.setNewData(list);
+    }
+
+    private static final class RechargeAdapter extends BaseQuickAdapter<Object, BaseViewHolder> {
+
+        public RechargeAdapter() {
+            super(R.layout.adapter_jun_you_coin_recharge);
+        }
+
+        @Override
+        protected void convert(BaseViewHolder helper, Object item) {
+            int currentPosition = helper.getAdapterPosition();
+           LinearLayout linearLayout = getHeaderLayout();
+           if (linearLayout!=null){
+               currentPosition--;
+           }
+            LinearLayout llJunYou =  helper.itemView.findViewById(R.id.ll_jun_you);
+            ImageView ivCoin = helper.itemView.findViewById(R.id.iv_coin);
+            if (currentPosition== mSelectedPosition){
+                llJunYou.setBackgroundResource(R.mipmap.img_bg_green_radius_15);
+                ivCoin.setImageResource(R.mipmap.me_jyb_gm_jb_sel);
+            }else {
+                llJunYou.setBackgroundResource(R.mipmap.img_bg_frame_white_radius_15);
+                ivCoin.setImageResource(R.mipmap.me_jyb_gm_jb_no);
+            }
+            String rechargeRMB = StringUtils.getMoney(10.0) + "(元)";
+            helper.setText(R.id.tv_recharge_rmb, rechargeRMB);
+            helper.setText(R.id.tv_jun_you_coin, "420俊友币");
+        }
+
+        private int mSelectedPosition = -1;
+
+    }
+
+}

jixin/src/main/res/color/selector_jun_you_coin.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:color="@color/white" android:state_selected="true" />
+
+    <item android:color="@color/white" android:state_checkable="true" />
+
+    <item android:color="#333333" />
+</selector>

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

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_selected="true" android:drawable="@mipmap/img_bg_green_radius_15"/>
+    <item android:state_checkable="true" android:drawable="@mipmap/img_bg_green_radius_15"/>
+
+    <item android:state_checked="true" android:drawable="@mipmap/img_bg_green_radius_15"/>
+    <item android:drawable="@mipmap/img_bg_frame_white_radius_15"/>
+
+
+</selector>

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

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_selected="true" android:drawable="@mipmap/me_jyb_gm_jb_sel"/>
+    <item android:state_checkable="true" android:drawable="@mipmap/me_jyb_gm_jb_sel"/>
+
+    <item android:state_checked="true" android:drawable="@mipmap/me_jyb_gm_jb_sel"/>
+    <item android:drawable="@mipmap/me_jyb_gm_jb_no"/>
+
+
+
+</selector>

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

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

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

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:orientation="vertical"
+    android:layout_height="match_parent">
+    <include
+        layout="@layout/a_view_actionbar"/>
+    <androidx.recyclerview.widget.RecyclerView
+        android:overScrollMode="never"
+        android:id="@+id/recycler_view_recharge"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+    </androidx.recyclerview.widget.RecyclerView>
+
+
+
+</LinearLayout>

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

@@ -123,7 +123,7 @@
 
                 <TextView
                     android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
+                    android:layout_height="wrap_content"
                     android:layout_marginTop="26dp"
                     android:gravity="center_horizontal"
                     android:text="会员尊享11项特权"

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

@@ -5,6 +5,12 @@
     android:layout_height="match_parent">
     <include
         layout="@layout/a_view_actionbar"/>
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/recycler_view_recharge"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+    </androidx.recyclerview.widget.RecyclerView>
 
 
 

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

@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:orientation="vertical"
+    android:gravity="center"
+    android:id="@+id/ll_recharge"
+    android:layout_marginTop="24dp"
+    android:layout_height="wrap_content">
+
+    <LinearLayout
+        android:id="@+id/ll_jun_you"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:background="@drawable/selector_buy_coin"
+        android:gravity="center_horizontal"
+        android:orientation="vertical">
+
+        <TextView
+            android:id="@+id/tv_recharge_rmb"
+            android:layout_width="76dp"
+            android:layout_height="16dp"
+            android:layout_marginTop="10dp"
+            android:background="@drawable/shape_bg_6bc193_radius_12"
+            android:gravity="center"
+            android:text="100（元）"
+            android:textColor="#ffffff"
+            android:textSize="11sp" />
+
+        <ImageView
+            android:id="@+id/iv_coin"
+            android:layout_width="42dp"
+            android:layout_height="42dp"
+            android:layout_marginTop="6dp"
+            android:src="@drawable/selector_coin" />
+
+        <TextView
+            android:id="@+id/tv_jun_you_coin"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="12dp"
+            android:text="52222俊友币"
+            android:textColor="@color/selector_jun_you_coin"
+            android:textSize="13sp" />
+
+    </LinearLayout>
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:text="购买"
+        android:layout_marginTop="6dp"
+
+        android:gravity="center"
+        android:paddingBottom="4dp"
+        android:textColor="#45C99B"
+
+        android:background="@mipmap/me_jyb_gm_bt"
+        android:layout_height="wrap_content"/>
+
+
+
+</LinearLayout>

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

@@ -0,0 +1,96 @@
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+
+    android:orientation="vertical">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_height="152dp"
+        android:layout_width="match_parent"
+
+        android:background="@mipmap/me_jyb_gm_bg1"
+        android:layout_margin="15dp">
+
+        <ImageView
+            android:id="@+id/iv_green_small_views"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="38dp"
+            android:layout_marginTop="36dp"
+            android:src="@mipmap/img_excharge_green_btn"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="俊友币"
+            android:textColor="#333333"
+            android:textSize="17sp"
+            app:layout_constraintBottom_toBottomOf="@+id/iv_green_small_views"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="@+id/iv_green_small_views" />
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+
+            android:layout_marginBottom="20dp"
+            android:gravity="bottom"
+            android:orientation="horizontal"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent">
+
+            <TextView
+                android:id="@+id/tv_jun_you_balance"
+
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="0.00"
+                android:textColor="#333333"
+                android:textSize="40sp"
+                android:textStyle="bold" />
+
+            <TextView
+
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="4dp"
+                android:text="余币"
+                android:textColor="#333333"
+                android:textSize="20sp" />
+        </LinearLayout>
+    </androidx.constraintlayout.widget.ConstraintLayout>
+    <LinearLayout
+        android:layout_marginBottom="12dp"
+        android:layout_width="match_parent"
+        android:orientation="horizontal"
+        android:gravity="center"
+        android:layout_height="match_parent">
+        <View
+
+            android:layout_width="50dp"
+            android:layout_height="1px"
+            android:textColor="#999999"/>
+
+        <TextView
+
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="4dp"
+            android:layout_marginEnd="4dp"
+            android:text="购买俊友币"
+            android:textColor="#333333"/>
+        <View
+
+            android:layout_width="50dp"
+            android:layout_height="1px"
+            android:textColor="#999999"/>
+
+
+
+    </LinearLayout>
+</LinearLayout>