添加息费锁门

src/main/java/com/common/bean/LoaningAmoutBean.java

@@ -6,11 +6,17 @@ import java.io.Serializable;
  * Created by SiKang on 2018/9/30.
  */
 public class LoaningAmoutBean implements Serializable {
-    private double dueAmount;
-    private double interest;
-    private double serviceFee;
-    private double totalAmount;
-    private double issueAmount;
+    private double dueAmount;// 100000.0,到期应还 -> Repayment Amount
+    private double interest; //3500.0,利息 -> Bunga
+    private double serviceFee; //400000.0,服务费 -> Biaya layanan
+    private double accountFee; //0,
+    private double issueAmount; //-303500.0,到手金额 Amount of arrival
+    private double totalAmount; //503500.0,
+    private double accountMangeFee; //100000.0,账号管理费 -> Biaya manajemen akun
+    private double reviewFee; //100000.0,审批费用 -> Biaya persetujuan
+    private double paymentFee; //100000.0,支付费用 -> Bayar biayanya
+    private double dataSearchFee; //100000.0数据查询费 -> Biaya penyelidikan data
+
 
     public double getDueAmount() {
         return dueAmount;
@@ -51,4 +57,44 @@ public class LoaningAmoutBean implements Serializable {
     public void setIssueAmount(double issueAmount) {
         this.issueAmount = issueAmount;
     }
+
+    public double getAccountFee() {
+        return accountFee;
+    }
+
+    public void setAccountFee(double accountFee) {
+        this.accountFee = accountFee;
+    }
+
+    public double getAccountMangeFee() {
+        return accountMangeFee;
+    }
+
+    public void setAccountMangeFee(double accountMangeFee) {
+        this.accountMangeFee = accountMangeFee;
+    }
+
+    public double getReviewFee() {
+        return reviewFee;
+    }
+
+    public void setReviewFee(double reviewFee) {
+        this.reviewFee = reviewFee;
+    }
+
+    public double getPaymentFee() {
+        return paymentFee;
+    }
+
+    public void setPaymentFee(double paymentFee) {
+        this.paymentFee = paymentFee;
+    }
+
+    public double getDataSearchFee() {
+        return dataSearchFee;
+    }
+
+    public void setDataSearchFee(double dataSearchFee) {
+        this.dataSearchFee = dataSearchFee;
+    }
 }

src/main/java/com/common/bean/ProductBean.java

@@ -28,11 +28,14 @@ public class ProductBean implements Serializable {
     private String certProgress = "";
     private boolean choose;
 
-    private double checkedAmount;
-    private int checkedPeriod;
+    private double checkedAmount = 0;
+    private int checkedPeriod = 0;
 
 
     public double getCheckedAmount() {
+        if(checkedAmount==0){
+            return minAmount;
+        }
         return checkedAmount;
     }
 
@@ -41,6 +44,9 @@ public class ProductBean implements Serializable {
     }
 
     public int getCheckedPeriod() {
+        if(checkedPeriod==0){
+            return minPeriod;
+        }
         return checkedPeriod;
     }
 

src/main/java/tech/starwin/base/RecyclerViewHolder.java

@@ -65,7 +65,10 @@ public class RecyclerViewHolder extends RecyclerView.ViewHolder {
         return (CheckBox) getView(viewId);
     }
 
-
+    public void setStringFormat(int viewId, String... text) {
+        String formatStr = getTextView(viewId).getText().toString();
+        getTextView(viewId).setText(String.format(formatStr, text));
+    }
 
 }
 

src/main/java/tech/starwin/utils/ui_utils/DialogManager.java

@@ -9,12 +9,16 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.TextView;
 
+import com.common.bean.LoaningAmoutBean;
 import com.tbruyelle.rxpermissions2.Permission;
 
 import tech.starwin.R;
 import tech.starwin.base.RecyclerViewHolder;
+
 import com.common.bean.LatestLoanAppBean;
 import com.common.bean.UpdateBean;
+
+import tech.starwin.impl.OnEventClickListener;
 import tech.starwin.utils.PreferencesManager;
 import tech.starwin.utils.context_utils.PermissionsHelper;
 
@@ -85,7 +89,27 @@ public class DialogManager {
     }
 
 
-
+    /**
+     * 息费说明
+     */
+    public static void showRoteDetailDialog(Context context, LoaningAmoutBean loanBean) {
+        DialogFactory.createCustomDialog(context, R.layout.dialog_rate_detail, (dialog, viewHolder) -> {
+            viewHolder.setStringFormat(R.id.dialog_ratedetail_total_amount_tv, "Rp" + (loanBean.getTotalAmount() - loanBean.getServiceFee() - loanBean.getInterest()));
+            viewHolder.setStringFormat(R.id.dialog_ratedetail_issue_amount_tv, "Rp" + loanBean.getIssueAmount());
+            viewHolder.setStringFormat(R.id.dialog_ratedetail_due_amount_tv, "Rp" + loanBean.getDueAmount());
+            viewHolder.setStringFormat(R.id.dialog_ratedetail_interest_tv, "Rp" + loanBean.getInterest());
+            viewHolder.setStringFormat(R.id.dialog_ratedetail_accountManageFee_tv, "Rp" + loanBean.getAccountMangeFee());
+            viewHolder.setStringFormat(R.id.dialog_ratedetail_reviewFee_tv, "Rp" + loanBean.getReviewFee());
+            viewHolder.setStringFormat(R.id.dialog_ratedetail_paymentFee_tv, "Rp" + loanBean.getPaymentFee());
+            viewHolder.setStringFormat(R.id.dialog_ratedetail_dataSearchFee_tv, "Rp" + loanBean.getDataSearchFee());
+            viewHolder.getButton(R.id.dialog_ratedetail_sure_btn).setOnClickListener(new OnEventClickListener() {
+                @Override
+                public void onEventClick(View v) {
+                    dialog.dismiss();
+                }
+            });
+        }).show();
+    }
 
 
 }

src/main/res/layout/dialog_rate_detail.xml

+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="280dp"
+    android:layout_height="wrap_content"
+    android:background="@color/white"
+    android:orientation="vertical">
+
+    <TextView
+        android:layout_width="280dp"
+        android:layout_height="wrap_content"
+        android:padding="15dp"
+        android:text="@string/text_rate_detail"
+        android:textColor="@color/black_gray"
+        android:textSize="18sp"
+        android:textStyle="bold" />
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:background="@color/gray_bg" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:padding="15dp">
+
+        <TextView
+            android:id="@+id/dialog_ratedetail_total_amount_tv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="10dp"
+            android:text="@string/text_total_amount"
+            android:textColor="@color/black_gray" />
+
+        <TextView
+            android:id="@+id/dialog_ratedetail_issue_amount_tv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="10dp"
+            android:text="@string/text_issue_amount"
+            android:textColor="@color/black_gray" />
+
+        <TextView
+            android:id="@+id/dialog_ratedetail_due_amount_tv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="25dp"
+            android:text="@string/text_due_amount"
+            android:textColor="@color/black_gray" />
+
+
+        <TextView
+            android:id="@+id/dialog_ratedetail_interest_tv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="10dp"
+            android:text="@string/text_interest"
+            android:textColor="@color/black_gray" />
+
+        <TextView
+            android:id="@+id/dialog_ratedetail_accountManageFee_tv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="10dp"
+            android:text="@string/text_accountMangeFee"
+            android:textColor="@color/black_gray" />
+
+        <TextView
+            android:id="@+id/dialog_ratedetail_reviewFee_tv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="10dp"
+            android:text="@string/text_reviewFee"
+            android:textColor="@color/black_gray" />
+
+        <TextView
+            android:id="@+id/dialog_ratedetail_paymentFee_tv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="10dp"
+            android:text="@string/text_paymentFee"
+            android:textColor="@color/black_gray" />
+
+        <TextView
+            android:id="@+id/dialog_ratedetail_dataSearchFee_tv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="10dp"
+            android:text="@string/text_dataSearchFee"
+            android:textColor="@color/black_gray" />
+
+    </LinearLayout>
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:background="@color/gray_bg"/>
+    <Button
+        android:id="@+id/dialog_ratedetail_sure_btn"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/text_sure"
+        android:background="@color/white"
+        android:textColor="@color/main_color"/>
+
+</LinearLayout>
\ No newline at end of file

src/main/res/values/colors.xml

@@ -15,6 +15,8 @@
     <color name="black_alpha30">#4D000000</color>
     <color name="black_alpha10">#1A000000</color>
 
+    <color name="black_gray">#505050</color>
+
     <color name="translateColor">#00000000</color>
     <color name="gray_bg">#F7F7F7</color>
     <color name="white">@android:color/white</color>

src/main/res/values/strings.xml

 <resources>
-    <string name="login">Login</string>
-    <string name="text_net_error">Tidak Ada Jaringan Internet</string><!--*keep*-->
-    <string name="text_app_error">Program Exception</string>
-    <string name="null_response">NO Data</string>
+    <string name="login" translatable="false">Login</string>
+    <string name="text_net_error" translatable="false">Tidak Ada Jaringan Internet</string><!--*keep*-->
+    <string name="text_app_error" translatable="false">Program Exception</string>
+    <string name="null_response" translatable="false">NO Data</string>
 
     <string name="text_welcome">Selamat Datang,</string>
 
@@ -18,10 +18,10 @@
 
     <string name="text_loan">Pinjaman</string>
     <string name="text_certification">Sertifikasi</string>
-    <string name="text_completed">Lengkap</string>
-    <string name="text_certification2">Bukti</string>
+    <string name="text_completed" translatable="false">Lengkap</string>
+    <string name="text_certification2" translatable="false">Bukti</string>
     <string name="text_me">Saya</string>
-    <string name="text_can_not_login">Tidak bisa masuk? Klik disini</string><!--*keep*-->
+    <string name="text_can_not_login" translatable="false">Tidak bisa masuk? Klik disini</string><!--*keep*-->
 
 
     <string name="loan_duration">Durasi Pinjaman</string>
@@ -37,6 +37,16 @@
     <string name="text_about">Tentang Kami</string>
     <string name="text_online_QA">Layanan Online</string>
 
+    <string name="text_rate_detail" translatable="false">Detail nilai</string>
+    <string name="text_total_amount" translatable="false">Jumlah Total: %s</string>
+    <string name="text_issue_amount" translatable="false">Jumlah diterima: %s</string>
+    <string name="text_due_amount" translatable="false">Jumlah dikembalikan: %s</string>
+    <string name="text_interest" translatable="false">Bunga: %s</string>
+    <string name="text_accountMangeFee" translatable="false">Biaya manajemen akun: %s</string>
+    <string name="text_reviewFee" translatable="false">Biaya persetujuan: %s</string>
+    <string name="text_paymentFee" translatable="false">Bayar biayanya: %s</string>
+    <string name="text_dataSearchFee" translatable="false">Biaya penyelidikan data: %s</string>
+
     <string name="account_verification_failed">Verifikasi Akun Gagal</string>
 
     <string name="text_low_level">Tingkat Anda belum cukup untuk mengajukan permohonan pada produk ini.</string>