配合vivo渠道审核修改

app/build.gradle

@@ -15,8 +15,8 @@ android {
         applicationId "com.smileflowpig.money"
         minSdkVersion 19
         targetSdkVersion 28
-        versionCode 13
-        versionName "2.2.0"
+        versionCode 14
+        versionName "2.2.1"
         multiDexEnabled true
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }

app/src/main/java/com/smileflowpig/money/moneyplatfrom/Adapter/MyAdapter.java

@@ -1,6 +1,7 @@
 package com.smileflowpig.money.moneyplatfrom.Adapter;
 
 import android.content.Context;
+import android.graphics.Typeface;
 import android.support.v4.view.PagerAdapter;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -55,6 +56,8 @@ public class MyAdapter extends PagerAdapter {
         GlideUtil.setImageViewCrop(context,list.get(position%list.size()).icon,icon);
 //        Glide.with(context).load(list.get(position%list.size()).icon).into(icon);
         name.setText(list.get(position%list.size()).name);
+        Typeface typeface = Typeface.createFromAsset(context.getAssets(), "fonts/text_one.ttf");
+        money.setTypeface(typeface);
         money.setText(list.get(position%list.size()).upper_amount+"-"+list.get(position%list.size()).lower_amount);
         goset.setOnClickListener(new View.OnClickListener() {
             @Override
@@ -63,6 +66,7 @@ public class MyAdapter extends PagerAdapter {
                 DetailActivity.show(context, list.get(position%list.size()).id+"","notice",0,5);
             }
         });
+
         container.addView(inflate);
         return inflate;
     }

app/src/main/java/com/smileflowpig/money/moneyplatfrom/Adapter/PlatformAdapter.java

@@ -52,6 +52,13 @@ public class PlatformAdapter extends RecyclerView.Adapter<PlatformAdapter.MyView
         holder.money.setText(list.get(position).upper_amount + "-" + list.get(position).lower_amount);
         holder.day.setText(list.get(position).term);
         String applicants = list.get(position).applicants;
+        String show_day = list.get(position).show_day;
+        holder.lilv_tv.setText("参考" + show_day);
+        if (show_day.equals("日利率")) {
+            holder.lilv_value_tv.setText(list.get(position).day_rate + "%");
+        } else {
+            holder.lilv_value_tv.setText(list.get(position).monthly_rate + "%");
+        }
         double v = Double.parseDouble(applicants);
         double v1 = v / 10000;
         String format = String.format("%.2f", v1);
@@ -94,6 +101,7 @@ public class PlatformAdapter extends RecyclerView.Adapter<PlatformAdapter.MyView
 
     /**
      * 设置标签背景
+     *
      * @param textView
      * @param content
      */
@@ -134,6 +142,8 @@ public class PlatformAdapter extends RecyclerView.Adapter<PlatformAdapter.MyView
         private final ImageView icon;
         private final TextView title;
         private final TextView title2;
+        public TextView lilv_tv;
+        public TextView lilv_value_tv;
 
         public MyViewHolder(View itemView) {
             super(itemView);
@@ -147,6 +157,8 @@ public class PlatformAdapter extends RecyclerView.Adapter<PlatformAdapter.MyView
             people = (TextView) itemView.findViewById(R.id.hot_people);
             title = (TextView) itemView.findViewById(R.id.pri_title);
             title2 = (TextView) itemView.findViewById(R.id.pri_title2);
+            lilv_tv = itemView.findViewById(R.id.item_hotadapter_lilv_tv);
+            lilv_value_tv = itemView.findViewById(R.id.lilv_text);
 
         }
     }

app/src/main/java/com/smileflowpig/money/moneyplatfrom/Adapter/SerchAdapter.java

@@ -38,7 +38,7 @@ public class SerchAdapter extends RecyclerView.Adapter<SerchAdapter.MyViewHolder
     @Override
     public MyViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
         View inflate = LayoutInflater.from(context).inflate(R.layout.serch_adapter_layout, null);
-        MyViewHolder myViewHolder=new MyViewHolder(inflate);
+        MyViewHolder myViewHolder = new MyViewHolder(inflate);
         return myViewHolder;
     }
 
@@ -46,17 +46,24 @@ public class SerchAdapter extends RecyclerView.Adapter<SerchAdapter.MyViewHolder
     @Override
     public void onBindViewHolder(MyViewHolder holder, final int position) {
 
-        GlideUtil.setImageViewCrop(context,list.get(position).icon,holder.icon);
+        GlideUtil.setImageViewCrop(context, list.get(position).icon, holder.icon);
 //        Glide.with(context).load(list.get(position).icon).into(holder.icon);
         holder.name.setText(list.get(position).name);
         holder.destroy.setText(list.get(position).description);
-        holder.money.setText(list.get(position).upper_amount+"-"+list.get(position).lower_amount);
+        holder.money.setText(list.get(position).upper_amount + "-" + list.get(position).lower_amount);
         holder.day.setText(list.get(position).term);
         String applicants = list.get(position).applicants;
+        String show_day = list.get(position).show_day;
+        holder.lilv_tv.setText("参考" + show_day);
+        if (show_day.equals("日利率")) {
+            holder.lilv_value_tv.setText(list.get(position).day_rate + "%");
+        } else {
+            holder.lilv_value_tv.setText(list.get(position).monthly_rate + "%");
+        }
         double v = Double.parseDouble(applicants);
         double v1 = v / 10000;
         String format = String.format("%.2f", v1);
-        holder.people.setText(format+"万人申请成功");
+        holder.people.setText(format + "万人申请成功");
 
         holder.itemView.setOnClickListener(new View.OnClickListener() {
             @Override
@@ -65,54 +72,56 @@ public class SerchAdapter extends RecyclerView.Adapter<SerchAdapter.MyViewHolder
             }
         });
 
-        try{
+        try {
             if (list.get(position).prod_title == null || list.get(position).prod_title.size() == 0) {
                 holder.title.setVisibility(View.GONE);
                 holder.title2.setVisibility(View.GONE);
             } else {
-                if(list.get(position).prod_title.size()<3){
-                    if(list.get(position).prod_title.size()==1){
+                if (list.get(position).prod_title.size() < 3) {
+                    if (list.get(position).prod_title.size() == 1) {
                         holder.title.setVisibility(View.VISIBLE);
                         holder.title.setText(list.get(position).prod_title.get(0));
-                        setShape(holder.title,list.get(position).prod_title.get(0));
+                        setShape(holder.title, list.get(position).prod_title.get(0));
                         holder.title2.setVisibility(View.GONE);
-                    }else if(list.get(position).prod_title.size()==2){
+                    } else if (list.get(position).prod_title.size() == 2) {
                         holder.title.setVisibility(View.VISIBLE);
                         holder.title.setText(list.get(position).prod_title.get(0));
-                        setShape(holder.title,list.get(position).prod_title.get(0));
+                        setShape(holder.title, list.get(position).prod_title.get(0));
                         holder.title2.setVisibility(View.VISIBLE);
                         holder.title2.setText(list.get(position).prod_title.get(1));
-                        setShape(holder.title2,list.get(position).prod_title.get(1));
+                        setShape(holder.title2, list.get(position).prod_title.get(1));
                     }
 
-                }else {
+                } else {
                     holder.title.setVisibility(View.VISIBLE);
                     holder.title.setText(list.get(position).prod_title.get(0));
-                    setShape(holder.title,list.get(position).prod_title.get(0));
+                    setShape(holder.title, list.get(position).prod_title.get(0));
                     holder.title2.setVisibility(View.VISIBLE);
                     holder.title2.setText(list.get(position).prod_title.get(1));
-                    setShape(holder.title2,list.get(position).prod_title.get(1));
+                    setShape(holder.title2, list.get(position).prod_title.get(1));
                 }
 
             }
-        }catch (Exception e){
+        } catch (Exception e) {
             holder.title.setVisibility(View.GONE);
             holder.title2.setVisibility(View.GONE);
         }
 
-        if(list.get(position).is_quality!=null){
-            if(list.get(position).is_quality.equals("0")){
+        if (list.get(position).is_quality != null) {
+            if (list.get(position).is_quality.equals("0")) {
                 holder.hotgo.setVisibility(View.GONE);
-            }else {
+            } else {
                 holder.hotgo.setVisibility(View.VISIBLE);
             }
-        }else {
+        } else {
             holder.hotgo.setVisibility(View.GONE);
         }
 
     }
+
     /**
      * 设置标签背景
+     *
      * @param textView
      * @param content
      */
@@ -136,6 +145,7 @@ public class SerchAdapter extends RecyclerView.Adapter<SerchAdapter.MyViewHolder
         textView.setBackgroundDrawable(drawable);
 
     }
+
     @Override
     public int getItemCount() {
         return list.size();
@@ -152,6 +162,8 @@ public class SerchAdapter extends RecyclerView.Adapter<SerchAdapter.MyViewHolder
         private final ImageView icon;
         private final TextView title;
         private final TextView title2;
+        public TextView lilv_tv;
+        public TextView lilv_value_tv;
 
         public MyViewHolder(View itemView) {
             super(itemView);
@@ -165,15 +177,18 @@ public class SerchAdapter extends RecyclerView.Adapter<SerchAdapter.MyViewHolder
             people = (TextView) itemView.findViewById(R.id.hot_people);
             title = (TextView) itemView.findViewById(R.id.pri_title);
             title2 = (TextView) itemView.findViewById(R.id.pri_title2);
+            lilv_tv = itemView.findViewById(R.id.item_searchadapter_lilv_tv);
+            lilv_value_tv = itemView.findViewById(R.id.lilv_text);
 
         }
     }
 
-    public interface getItempostion{
+    public interface getItempostion {
 
         void success(int pos);
     }
-    public void setItempostion(getItempostion getItempostion){
-        this.getItempostion=getItempostion;
+
+    public void setItempostion(getItempostion getItempostion) {
+        this.getItempostion = getItempostion;
     }
 }

app/src/main/java/com/smileflowpig/money/moneyplatfrom/activities/DetailActivity.java

@@ -35,6 +35,7 @@ import android.widget.TextView;
 import android.widget.Toast;
 
 import com.bumptech.glide.Glide;
+import com.smileflowpig.money.BuildConfig;
 import com.smileflowpig.money.moneyplatfrom.Adapter.Detail_popAdapter;
 import com.smileflowpig.money.moneyplatfrom.Bean.CheckGuidJson;
 import com.smileflowpig.money.moneyplatfrom.Bean.NoteEntity;
@@ -324,7 +325,7 @@ public class DetailActivity extends PresenterActivity<DetailContract.Presenter>
             backDialog.setOnDialogClickListener(new DetialDialog.OnDialogClickListener() {
                 @Override
                 public void onFinish() {
-                    MobclickAgent.onEvent(DetailActivity.this,"detialback_true");
+                    MobclickAgent.onEvent(DetailActivity.this, "detialback_true");
                     finish();
                     if (!TextUtils.isEmpty(flag)) {
                         MainActivity.show(DetailActivity.this);
@@ -333,7 +334,7 @@ public class DetailActivity extends PresenterActivity<DetailContract.Presenter>
 
                 @Override
                 public void cancle() {
-                    MobclickAgent.onEvent(DetailActivity.this,"detialback_false");
+                    MobclickAgent.onEvent(DetailActivity.this, "detialback_false");
                     backDialog.dismiss();
                 }
             });
@@ -596,17 +597,32 @@ public class DetailActivity extends PresenterActivity<DetailContract.Presenter>
         obser.setText(product.getLend_time());
         num = product.getId();
         type.setText(product.getShow_day());
-        if (product.getShow_day().equals("参考月利率")) {
-            lilv.setText(product.getMonthly_rate() + "%");
-            myfust.setText("参考月利率" + product.getMonthly_rate() + "%");
-            //timetype.setText("每月还款金额");
-        } else if(product.getShow_day().equals("参考日利率")){
-            lilv.setText(product.getDay_rate() + "%");
-            myfust.setText("参考日利率" + product.getDay_rate() + "%");
-            //timetype.setText("每日还款金额");
-        }else if(product.getShow_day().equals("参考年利率")){
+//        if (BuildConfig.CHANNLE.equals("1003")) {
+//            type.setText("参考年利率");
+//            //vivo渠道只能显示年利率
+//            // TODO: 2019/6/3 显示年利率
+//            lilv.setText(product.getYear_rate() + "%");
+//            myfust.setText("参考年利率" + product.getYear_rate() + "%");
+//
+//            List<Dialogs> loan_periods = new ArrayList<>();
+//            loan_periods.add(new Dialogs("1", "1年", false));
+//            loan_periods.add(new Dialogs("2", "2年", false));
+//            loan_periods.add(new Dialogs("3", "3年", false));
+//            product.setLoan_period(loan_periods);
+//
+//        } else {
+            if (product.getShow_day().equals("参考月利率")) {
+                lilv.setText(product.getMonthly_rate() + "%");
+                myfust.setText("参考月利率" + product.getMonthly_rate() + "%");
+                //timetype.setText("每月还款金额");
 
-        }
+            } else {
+                lilv.setText(product.getDay_rate() + "%");
+                myfust.setText("参考日利率" + product.getDay_rate() + "%");
+                //timetype.setText("每日还款金额");
+            }
+
+//        }
 
         success.setText("成功放款人数" + product.getApplicants() + "人");
         cond.setText(product.getRequirements());
@@ -737,22 +753,31 @@ public class DetailActivity extends PresenterActivity<DetailContract.Presenter>
                     double v2 = Double.parseDouble(product.getLoan_period().get(num2).getK());
                     double v1 = Double.parseDouble(trim);
                     if (!TextUtils.isEmpty(trim)) {
-                        if (product.getShow_day().equals("参考日利率")) {
-                            double c = Double.parseDouble(product.getDay_rate());
-                            if (s1.substring(s1.length() - 1, s1.length()).equals("月")) {
-                                v2 = v2 * 30;
+//                        if (BuildConfig.CHANNLE.equals("1003")) {
+//                            double c = Double.parseDouble(product.getYear_rate());
+//                            double ben = v1 + v1 * v2 * c / 100;
+//                            double v3 = v1 * v2 * c / 100;
+//                            contver.setText(String.format("%.2f", v3));
+//                            fuast.setText(String.format("%.2f", ben));
+//                        } else {
+                            if (product.getShow_day().equals("参考日利率")) {
+                                double c = Double.parseDouble(product.getDay_rate());
+                                if (s1.substring(s1.length() - 1, s1.length()).equals("月")) {
+                                    v2 = v2 * 30;
+                                }
+                                double ben = v1 + v1 * v2 * c / 100;
+                                double v3 = v1 * v2 * c / 100;
+                                contver.setText(String.format("%.2f", v3));
+                                fuast.setText(String.format("%.2f", ben));
+                            } else {
+                                double c = Double.parseDouble(product.getMonthly_rate());
+                                double ben = v1 + v1 * v2 * c / 100;
+                                double v3 = v1 * v2 * c / 100;
+                                contver.setText(String.format("%.2f", v3));
+                                fuast.setText(String.format("%.2f", ben));
                             }
-                            double ben = v1 + v1 * v2 * c / 100;
-                            double v3 = v1 * v2 * c / 100;
-                            contver.setText(String.format("%.2f", v3));
-                            fuast.setText(String.format("%.2f", ben));
-                        } else {
-                            double c = Double.parseDouble(product.getMonthly_rate());
-                            double ben = v1 + v1 * v2 * c / 100;
-                            double v3 = v1 * v2 * c / 100;
-                            contver.setText(String.format("%.2f", v3));
-                            fuast.setText(String.format("%.2f", ben));
-                        }
+//                        }
+
                     }
                 } else {
                     fuast.setText(String.format("%.2f", 0.0));
@@ -787,23 +812,39 @@ public class DetailActivity extends PresenterActivity<DetailContract.Presenter>
             Pattern p = Pattern.compile("\\d+");
             Matcher m = p.matcher(s);
             m.find();
+            //贷款期限
             double b = Double.parseDouble(product.getLoan_period().get(pos).getK());
-            if (product.getShow_day().equals("参考日利率")) {
-                double c = Double.parseDouble(product.getDay_rate());
-                if (s.substring(s.length() - 1, s.length()).equals("月")) {
-                    b = b * 30;
+//            if (BuildConfig.CHANNLE.equals("1003")) {
+//                //vivo渠道必须显示年利率
+//                //年利率
+//                double c = Double.parseDouble(product.getYear_rate());
+//                //应还利息
+//                double v = a * c * b / 100;
+//                //总还金额
+//                double ben = a + b * c * a / 100;
+//                contver.setText(String.format("%.2f", v));
+//                fuast.setText(String.format("%.2f", ben));
+//            } else {
+                if (product.getShow_day().equals("参考日利率")) {
+                    double c = Double.parseDouble(product.getDay_rate());
+                    if (s.substring(s.length() - 1, s.length()).equals("月")) {
+                        b = b * 30;
+                    }
+                    double ben = a + b * c * a / 100;
+                    double v = b * c * a / 100;
+                    contver.setText(String.format("%.2f", v));
+                    fuast.setText(String.format("%.2f", ben));
+                } else {
+                    double c = Double.parseDouble(product.getMonthly_rate());
+
+
+                    double v = b * c * a / 100;
+                    double ben = a + b * c * a / 100;
+                    contver.setText(String.format("%.2f", v));
+                    fuast.setText(String.format("%.2f", ben));
                 }
-                double ben = a + b * c * a / 100;
-                double v = b * c * a / 100;
-                contver.setText(String.format("%.2f", v));
-                fuast.setText(String.format("%.2f", ben));
-            } else {
-                double c = Double.parseDouble(product.getMonthly_rate());
-                double v = b * c * a / 100;
-                double ben = a + b * c * a / 100;
-                contver.setText(String.format("%.2f", v));
-                fuast.setText(String.format("%.2f", ben));
-            }
+//            }
+
         }
     }
 
@@ -1219,7 +1260,11 @@ public class DetailActivity extends PresenterActivity<DetailContract.Presenter>
     public void light(float t) {
         WindowManager.LayoutParams lp = getWindow().getAttributes();
         lp.alpha = t;
-        getWindow().addFlags(WindowManager.LayoutParams.FLAG_DIM_BEHIND);
+        if (t == 1.0f) {
+            getWindow().clearFlags(WindowManager.LayoutParams.FLAG_DIM_BEHIND);
+        } else {
+            getWindow().addFlags(WindowManager.LayoutParams.FLAG_DIM_BEHIND);
+        }
         getWindow().setAttributes(lp);
     }
 

app/src/main/java/com/smileflowpig/money/moneyplatfrom/frags/main/state/HuaHomeFragment.java

@@ -663,7 +663,6 @@ public class HuaHomeFragment extends PresenterFragment implements View.OnClickLi
                     Intent intent11 = new Intent(getActivity(), AccountActivity.class);
                     startActivityForResult(intent11, Constant.Code.REQUEST_CODE);
                 }
-
                 break;
             case R.id.appraisal:
                 if(liulang){

app/src/main/java/com/smileflowpig/money/moneyplatfrom/frags/main/state/PigHomeFragment.java

@@ -374,37 +374,41 @@ public class PigHomeFragment extends PresenterFragment implements View.OnClickLi
     }
 
     public void gettitle() {
-        Observable<PigTitleBean> pigTitleBeanObservable = new NetRequestUtils().bucuo().getbaseretrofit().getpigtitle().subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread());
-        pigTitleBeanObservable.subscribe(new Observer<PigTitleBean>() {
-            @Override
-            public void onSubscribe(Disposable d) {
-
-            }
-
-            @Override
-            public void onNext(PigTitleBean pigTitleBean) {
-                try {
-                    rstBean = pigTitleBean.rst;
-                    titleone.setText(rstBean._$1);
-                    titletwo.setText(rstBean._$2);
-                    titlethree.setText(rstBean._$3);
-                } catch (Exception e) {
-
-                }
-
-            }
-
-            @Override
-            public void onError(Throwable e) {
-
-            }
-
-            @Override
-            public void onComplete() {
-
-            }
-        });
+        fourTab_layout.setVisibility(View.GONE);
+//        Observable<PigTitleBean> pigTitleBeanObservable = new NetRequestUtils().bucuo().getbaseretrofit().getpigtitle().subscribeOn(Schedulers.io())
+//                .observeOn(AndroidSchedulers.mainThread());
+//        pigTitleBeanObservable.subscribe(new Observer<PigTitleBean>() {
+//            @Override
+//            public void onSubscribe(Disposable d) {
+//
+//            }
+//
+//            @Override
+//            public void onNext(PigTitleBean pigTitleBean) {
+//                try {
+//                    if(fourTab_layout.getVisibility()!=View.VISIBLE)
+//                    fourTab_layout.setVisibility(View.VISIBLE);
+//                    rstBean = pigTitleBean.rst;
+//                    titleone.setText(rstBean._$1);
+//                    titletwo.setText(rstBean._$2);
+//                    titlethree.setText(rstBean._$3);
+//                } catch (Exception e) {
+//                    fourTab_layout.setVisibility(View.GONE);
+//
+//                }
+//
+//            }
+//
+//            @Override
+//            public void onError(Throwable e) {
+//                fourTab_layout.setVisibility(View.GONE);
+//            }
+//
+//            @Override
+//            public void onComplete() {
+//
+//            }
+//        });
     }
 
     public void getclose() {

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

@@ -3,18 +3,18 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="117px"
+    android:layout_marginRight="12px"
     android:background="@color/white"
     android:orientation="horizontal"
-    android:paddingTop="20px"
-    android:paddingBottom="20px"
     android:paddingLeft="30px"
-    android:layout_marginRight="12px">
+    android:paddingTop="20px"
+    android:paddingBottom="20px">
 
     <LinearLayout
-        android:layout_width="240px"
+        android:layout_width="260px"
         android:layout_height="wrap_content"
-        android:paddingLeft="10px"
-        android:orientation="vertical">
+        android:orientation="vertical"
+        android:paddingLeft="10px">
 
         <RelativeLayout
             android:layout_width="match_parent"
@@ -23,24 +23,25 @@
             android:orientation="horizontal">
 
 
-
             <RelativeLayout
                 android:id="@+id/hot_icon_layout"
                 android:layout_width="40px"
                 android:layout_height="40px">
-            <ImageView
-                android:id="@+id/hot_icon"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_centerVertical="true"
-                android:scaleType="centerInside"
-                android:src="@mipmap/ic_flowpig" />
+
+                <ImageView
+                    android:id="@+id/hot_icon"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_centerVertical="true"
+                    android:scaleType="centerInside"
+                    android:src="@mipmap/ic_flowpig" />
             </RelativeLayout>
+
             <RelativeLayout
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
-                android:layout_marginLeft="10px"
                 android:layout_centerVertical="true"
+                android:layout_marginLeft="10px"
                 android:layout_toRightOf="@id/hot_icon_layout">
 
                 <LinearLayout
@@ -54,9 +55,9 @@
                         android:id="@+id/hot_name"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="花无尽消费贷"
                         android:layout_gravity="center_vertical"
                         android:gravity="center_vertical"
+                        android:text="花无尽消费贷"
                         android:textColor="@color/text_black"
                         android:textSize="14px"
                         android:textStyle="bold" />
@@ -65,32 +66,32 @@
                         android:id="@+id/pri_title"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_marginLeft="9px"
                         android:layout_gravity="center_vertical"
+                        android:layout_marginLeft="9px"
                         android:gravity="center"
-                        android:textStyle="bold"
                         android:paddingLeft="5px"
                         android:paddingTop="2px"
-                        android:paddingBottom="2px"
                         android:paddingRight="5px"
+                        android:paddingBottom="2px"
                         android:textColor="@color/white"
                         android:textSize="10px"
+                        android:textStyle="bold"
                         android:visibility="gone" />
 
                     <TextView
                         android:id="@+id/pri_title2"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
+                        android:layout_gravity="center_vertical"
                         android:layout_marginLeft="9px"
                         android:gravity="center"
-                        android:layout_gravity="center_vertical"
-                        android:textStyle="bold"
-                        android:paddingTop="2px"
-                        android:paddingBottom="2px"
                         android:paddingLeft="5px"
+                        android:paddingTop="2px"
                         android:paddingRight="5px"
+                        android:paddingBottom="2px"
                         android:textColor="@color/white"
                         android:textSize="10px"
+                        android:textStyle="bold"
                         android:visibility="gone" />
                 </LinearLayout>
 
@@ -98,8 +99,8 @@
                     android:id="@+id/hot_destory"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="3px"
                     android:layout_below="@+id/hot_adapter_title_layout"
+                    android:layout_marginTop="3px"
                     android:ellipsize="end"
                     android:maxLines="1"
                     android:text="随时随地,想借就借"
@@ -119,9 +120,9 @@
 
             <LinearLayout
                 android:layout_width="0dp"
-                android:layout_weight="1"
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
+                android:layout_weight="1"
                 android:gravity="center_vertical"
                 android:orientation="vertical">
 
@@ -130,8 +131,8 @@
                     android:layout_height="wrap_content"
                     android:text="额度 (元)"
                     android:textColor="#666666"
-                    android:textStyle="bold"
-                    android:textSize="12px" />
+                    android:textSize="12px"
+                    android:textStyle="bold" />
 
                 <TextView
                     android:id="@+id/hot_money"
@@ -145,23 +146,23 @@
 
             <RelativeLayout
                 android:layout_width="0dp"
-                android:layout_weight="1"
                 android:layout_height="wrap_content"
                 android:layout_alignParentRight="true"
-               >
+                android:layout_weight="1">
 
                 <LinearLayout
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="15px"
                     android:orientation="vertical">
+
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="期限"
-                        android:textStyle="bold"
                         android:textColor="#666666"
-                        android:textSize="12px" />
+                        android:textSize="12px"
+                        android:textStyle="bold" />
 
                     <TextView
                         android:id="@+id/hot_day"
@@ -219,14 +220,12 @@
 
 
     <RelativeLayout
-        android:layout_width="135px"
-        android:layout_height="match_parent"
-       >
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent">
 
         <LinearLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_alignParentBottom="true"
             android:orientation="vertical">
 
             <TextView
@@ -236,21 +235,49 @@
                 android:layout_gravity="center_horizontal"
                 android:background="@mipmap/icon_shenqin"
                 android:gravity="center"
-                android:paddingBottom="3px"
-                android:text="立即申请"
-                android:textStyle="bold"
                 android:paddingLeft="13px"
                 android:paddingRight="13px"
+                android:paddingBottom="3px"
+                android:text="立即申请"
                 android:textColor="@color/text_black"
-                android:textSize="14px" />
+                android:textSize="14px"
+                android:textStyle="bold" />
 
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:layout_marginTop="10px"
+                android:orientation="vertical">
+
+                <TextView
+                    android:id="@+id/item_hotadapter_lilv_tv"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="参考日利率"
+                    android:textColor="#666666"
+                    android:textSize="12px"
+                    android:textStyle="bold" />
+
+                <TextView
+                    android:id="@+id/lilv_text"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="3px"
+                    android:singleLine="true"
+                    android:text="0.59%"
+                    android:textColor="@color/text_yellow_color"
+                    android:textSize="14px"
+                    android:textStyle="bold" />
+            </LinearLayout>
 
             <LinearLayout
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="5px"
                 android:gravity="center"
-                android:orientation="vertical">
+                android:orientation="vertical"
+                android:visibility="gone">
 
                 <TextView
                     android:layout_width="wrap_content"

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

@@ -7,7 +7,7 @@
     android:orientation="horizontal">
 
     <LinearLayout
-        android:layout_width="220px"
+        android:layout_width="240px"
         android:layout_height="match_parent"
         android:layout_marginLeft="15px"
         android:layout_marginTop="15px"
@@ -213,7 +213,7 @@
         android:layout_width="135px"
         android:layout_height="match_parent"
         android:orientation="horizontal"
-        android:paddingBottom="15px">
+        android:layout_marginBottom="15px">
 
 
         <ImageView
@@ -225,11 +225,39 @@
             android:scaleType="fitXY"
             android:src="@mipmap/quality" />
 
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerHorizontal="true"
+            android:layout_gravity="center_horizontal"
+            android:layout_alignParentBottom="true"
+            android:orientation="vertical">
+
+            <TextView
+                android:id="@+id/item_searchadapter_lilv_tv"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:text="参考日利率"
+                android:textColor="#666666"
+                android:textSize="12px"
+                android:textStyle="bold" />
 
+            <TextView
+                android:id="@+id/lilv_text"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="3px"
+                android:singleLine="true"
+                android:text="0.59%"
+                android:textColor="@color/text_yellow_color"
+                android:textSize="14px"
+                android:textStyle="bold" />
+        </LinearLayout>
         <LinearLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_alignParentBottom="true"
+            android:visibility="gone"
             android:layout_centerHorizontal="true"
             android:layout_marginRight="3px"
             android:gravity="center"

factory/src/main/java/com/smileflowpig/money/factory/model/api/product/ProductDetail.java

@@ -49,6 +49,17 @@ public class ProductDetail {
     private int is_collection;
     private String is_quality;
 
+    private String year_rate;
+
+
+    public String getYear_rate() {
+        return year_rate;
+    }
+
+    public void setYear_rate(String year_rate) {
+        this.year_rate = year_rate;
+    }
+
     public String getCustomer_service_number() {
         return customer_service_number;
     }