修改产品列表标签

app/build.gradle

@@ -58,151 +58,45 @@ android {
     }
 
     productFlavors {
-        z30033 {
-            manifestPlaceholders = [UMENG_CHANNEL_VALUE: "30001"]
-            buildConfigField 'String', 'CHANNLE', '"30001"'
-        }
+
 
         aoppo {
-            manifestPlaceholders = [UMENG_CHANNEL_VALUE: "30074"]
-            buildConfigField 'String', 'CHANNLE', '"30074"'
+            manifestPlaceholders = [UMENG_CHANNEL_VALUE: "1006"]
+            buildConfigField 'String', 'CHANNLE', '"1006"'
         }
 
         a360 {
-            manifestPlaceholders = [UMENG_CHANNEL_VALUE: "30071"]
-            buildConfigField 'String', 'CHANNLE', '"30071"'
+            manifestPlaceholders = [UMENG_CHANNEL_VALUE: "1002"]
+            buildConfigField 'String', 'CHANNLE', '"1002"'
         }
 
         ayingyongbao {
-            manifestPlaceholders = [UMENG_CHANNEL_VALUE: "30070"]
-            buildConfigField 'String', 'CHANNLE', '"30070"'
+            manifestPlaceholders = [UMENG_CHANNEL_VALUE: "1001"]
+            buildConfigField 'String', 'CHANNLE', '"1001"'
         }
 
         axiaomi {
-            manifestPlaceholders = [UMENG_CHANNEL_VALUE: "30075"]
-            buildConfigField 'String', 'CHANNLE', '"30075"'
+            manifestPlaceholders = [UMENG_CHANNEL_VALUE: "1004"]
+            buildConfigField 'String', 'CHANNLE', '"1004"'
         }
 
         ahuawei {
-            manifestPlaceholders = [UMENG_CHANNEL_VALUE: "30076"]
-            buildConfigField 'String', 'CHANNLE', '"30076"'
+            manifestPlaceholders = [UMENG_CHANNEL_VALUE: "1005"]
+            buildConfigField 'String', 'CHANNLE', '"1005"'
         }
 
-        abaidu {
-            manifestPlaceholders = [UMENG_CHANNEL_VALUE: "30072"]
-            buildConfigField 'String', 'CHANNLE', '"30072"'
-        }
+
         ameizu {
-            manifestPlaceholders = [UMENG_CHANNEL_VALUE: "1001"]
-            buildConfigField 'String', 'CHANNLE', '"1001"'
+            manifestPlaceholders = [UMENG_CHANNEL_VALUE: "1007"]
+            buildConfigField 'String', 'CHANNLE', '"1007"'
         }
         avivo {
-            manifestPlaceholders = [UMENG_CHANNEL_VALUE: "1002"]
-            buildConfigField 'String', 'CHANNLE', '"1002"'
-        }
-        aqqlibray {
-            manifestPlaceholders = [UMENG_CHANNEL_VALUE: "30063"]
-            buildConfigField 'String', 'CHANNLE', '"30063"'
-        }
-
-        axunfei {
-            manifestPlaceholders = [UMENG_CHANNEL_VALUE: "30068"]
-            buildConfigField 'String', 'CHANNLE', '"30068"'
-        }
-
-
-        bvivo {
-            manifestPlaceholders = [UMENG_CHANNEL_VALUE: "30057"]
-            buildConfigField 'String', 'CHANNLE', '"30057"'
-        }
-
-        bxiaomi {
-            manifestPlaceholders = [UMENG_CHANNEL_VALUE: "30058"]
-            buildConfigField 'String', 'CHANNLE', '"30058"'
-        }
-
-        byingyongbao {
-            manifestPlaceholders = [UMENG_CHANNEL_VALUE: "30059"]
-            buildConfigField 'String', 'CHANNLE', '"30059"'
+            manifestPlaceholders = [UMENG_CHANNEL_VALUE: "1003"]
+            buildConfigField 'String', 'CHANNLE', '"1003"'
         }
 
-        bhuawei {
-            manifestPlaceholders = [UMENG_CHANNEL_VALUE: "30060"]
-            buildConfigField 'String', 'CHANNLE', '"30060"'
-        }
-        qutoutiao01 {
-            manifestPlaceholders = [UMENG_CHANNEL_VALUE: "40014"]
-            buildConfigField 'String', 'CHANNLE', '"40014"'
-        }
-        qutoutiao02 {
-            manifestPlaceholders = [UMENG_CHANNEL_VALUE: "40015"]
-            buildConfigField 'String', 'CHANNLE', '"40015"'
-        }
-        qutoutiao03 {
-            manifestPlaceholders = [UMENG_CHANNEL_VALUE: "40016"]
-            buildConfigField 'String', 'CHANNLE', '"40016"'
-        }
-        qutoutiao04 {
-            manifestPlaceholders = [UMENG_CHANNEL_VALUE: "40017"]
-            buildConfigField 'String', 'CHANNLE', '"40017"'
-        }
-        qutoutiao05 {
-            manifestPlaceholders = [UMENG_CHANNEL_VALUE: "40018"]
-            buildConfigField 'String', 'CHANNLE', '"40018"'
-        }
-        qutoutiao06 {
-            manifestPlaceholders = [UMENG_CHANNEL_VALUE: "40019"]
-            buildConfigField 'String', 'CHANNLE', '"40019"'
-        }
 
-        qutoutiao07 {
-            manifestPlaceholders = [UMENG_CHANNEL_VALUE: "40020"]
-            buildConfigField 'String', 'CHANNLE', '"40020"'
-        }
-        qutoutiao08 {
-            manifestPlaceholders = [UMENG_CHANNEL_VALUE: "40021"]
-            buildConfigField 'String', 'CHANNLE', '"40021"'
-        }
-        qutoutiao09 {
-            manifestPlaceholders = [UMENG_CHANNEL_VALUE: "40022"]
-            buildConfigField 'String', 'CHANNLE', '"40022"'
-        }
-        qutoutiao10 {
-            manifestPlaceholders = [UMENG_CHANNEL_VALUE: "40023"]
-            buildConfigField 'String', 'CHANNLE', '"40023"'
-        }
-        qutoutiao11 {
-            manifestPlaceholders = [UMENG_CHANNEL_VALUE: "40024"]
-            buildConfigField 'String', 'CHANNLE', '"40024"'
-        }
-
-
-        shenmashousuo01 {
-            manifestPlaceholders = [UMENG_CHANNEL_VALUE: "40026"]
-            buildConfigField 'String', 'CHANNLE', '"40026"'
-        }
-        shenmashousuo02 {
-            manifestPlaceholders = [UMENG_CHANNEL_VALUE: "40027"]
-            buildConfigField 'String', 'CHANNLE', '"40027"'
-        }
-        shenmashousuo03 {
-            manifestPlaceholders = [UMENG_CHANNEL_VALUE: "40028"]
-            buildConfigField 'String', 'CHANNLE', '"40028"'
-        }
-        shenmashousuo04 {
-            manifestPlaceholders = [UMENG_CHANNEL_VALUE: "40029"]
-            buildConfigField 'String', 'CHANNLE', '"40029"'
-        }
-        shenmashousuo05 {
-            manifestPlaceholders = [UMENG_CHANNEL_VALUE: "40030"]
-            buildConfigField 'String', 'CHANNLE', '"40030"'
-        }
-        shenmashousuo06 {
-            manifestPlaceholders = [UMENG_CHANNEL_VALUE: "40031"]
-            buildConfigField 'String', 'CHANNLE', '"40031"'
-        }
 
-//
 
     }
 }

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

@@ -60,11 +60,29 @@ public class PlatformAdapter extends RecyclerView.Adapter<PlatformAdapter.MyView
                 getItempostion.success(position);
             }
         });
-        if (list.get(position).prod_title.get(0).equals("")) {
+        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 {
-            holder.title.setVisibility(View.VISIBLE);
-            holder.title.setText(list.get(position).prod_title.get(0));
+            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));
+                    holder.title2.setVisibility(View.GONE);
+                }else if(list.get(position).prod_title.size()==2){
+                    holder.title.setVisibility(View.VISIBLE);
+                    holder.title.setText(list.get(position).prod_title.get(0));
+                    holder.title2.setVisibility(View.VISIBLE);
+                    holder.title2.setText(list.get(position).prod_title.get(1));
+                }
+
+            }else {
+                holder.title.setVisibility(View.VISIBLE);
+                holder.title.setText(list.get(position).prod_title.get(0));
+                holder.title2.setVisibility(View.VISIBLE);
+                holder.title2.setText(list.get(position).prod_title.get(1));
+            }
+
         }
     }
 
@@ -83,6 +101,7 @@ public class PlatformAdapter extends RecyclerView.Adapter<PlatformAdapter.MyView
         private final TextView name;
         private final ImageView icon;
         private final TextView title;
+        private final TextView title2;
 
         public MyViewHolder(View itemView) {
             super(itemView);
@@ -95,6 +114,7 @@ public class PlatformAdapter extends RecyclerView.Adapter<PlatformAdapter.MyView
             day = (TextView) itemView.findViewById(R.id.hot_day);
             people = (TextView) itemView.findViewById(R.id.hot_people);
             title = (TextView) itemView.findViewById(R.id.pri_title);
+            title2 = (TextView) itemView.findViewById(R.id.pri_title2);
 
         }
     }

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

@@ -62,11 +62,29 @@ public class SerchAdapter extends RecyclerView.Adapter<SerchAdapter.MyViewHolder
             }
         });
 
-        if(list.get(position).prod_title.get(0).equals("")){
+        if (list.get(position).prod_title == null || list.get(position).prod_title.size() == 0) {
             holder.title.setVisibility(View.GONE);
-        }else {
-            holder.title.setVisibility(View.VISIBLE);
-            holder.title.setText(list.get(position).prod_title.get(0));
+            holder.title2.setVisibility(View.GONE);
+        } else {
+            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));
+                    holder.title2.setVisibility(View.GONE);
+                }else if(list.get(position).prod_title.size()==2){
+                    holder.title.setVisibility(View.VISIBLE);
+                    holder.title.setText(list.get(position).prod_title.get(0));
+                    holder.title2.setVisibility(View.VISIBLE);
+                    holder.title2.setText(list.get(position).prod_title.get(1));
+                }
+
+            }else {
+                holder.title.setVisibility(View.VISIBLE);
+                holder.title.setText(list.get(position).prod_title.get(0));
+                holder.title2.setVisibility(View.VISIBLE);
+                holder.title2.setText(list.get(position).prod_title.get(1));
+            }
+
         }
         if(list.get(position).is_quality!=null){
             if(list.get(position).is_quality.equals("0")){
@@ -95,6 +113,7 @@ public class SerchAdapter extends RecyclerView.Adapter<SerchAdapter.MyViewHolder
         private final TextView name;
         private final ImageView icon;
         private final TextView title;
+        private final TextView title2;
 
         public MyViewHolder(View itemView) {
             super(itemView);
@@ -107,6 +126,7 @@ public class SerchAdapter extends RecyclerView.Adapter<SerchAdapter.MyViewHolder
             day = (TextView) itemView.findViewById(R.id.hot_day);
             people = (TextView) itemView.findViewById(R.id.hot_people);
             title = (TextView) itemView.findViewById(R.id.pri_title);
+            title2 = (TextView) itemView.findViewById(R.id.pri_title2);
 
         }
     }

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

@@ -60,11 +60,29 @@ public class TabAdapter extends RecyclerView.Adapter<TabAdapter.MyViewHolder> {
                 getItempostion.success(position);
             }
         });
-        if(list.get(position).prod_title.get(0).equals("")){
+        if (list.get(position).prod_title == null || list.get(position).prod_title.size() == 0) {
             holder.title.setVisibility(View.GONE);
-        }else {
-            holder.title.setVisibility(View.VISIBLE);
-            holder.title.setText(list.get(position).prod_title.get(0));
+            holder.title2.setVisibility(View.GONE);
+        } else {
+            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));
+                    holder.title2.setVisibility(View.GONE);
+                }else if(list.get(position).prod_title.size()==2){
+                    holder.title.setVisibility(View.VISIBLE);
+                    holder.title.setText(list.get(position).prod_title.get(0));
+                    holder.title2.setVisibility(View.VISIBLE);
+                    holder.title2.setText(list.get(position).prod_title.get(1));
+                }
+
+            }else {
+                holder.title.setVisibility(View.VISIBLE);
+                holder.title.setText(list.get(position).prod_title.get(0));
+                holder.title2.setVisibility(View.VISIBLE);
+                holder.title2.setText(list.get(position).prod_title.get(1));
+            }
+
         }
     }
 
@@ -83,6 +101,7 @@ public class TabAdapter extends RecyclerView.Adapter<TabAdapter.MyViewHolder> {
         private final TextView name;
         private final ImageView icon;
         private final TextView title;
+        private final TextView title2;
 
         public MyViewHolder(View itemView) {
             super(itemView);
@@ -95,6 +114,7 @@ public class TabAdapter extends RecyclerView.Adapter<TabAdapter.MyViewHolder> {
             day = (TextView) itemView.findViewById(R.id.hot_day);
             people = (TextView) itemView.findViewById(R.id.hot_people);
             title = (TextView) itemView.findViewById(R.id.pri_title);
+            title2 = (TextView) itemView.findViewById(R.id.pri_title2);
 
         }
     }

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

@@ -49,7 +49,7 @@ public class MessContextActivity extends PresenterActivity implements View.OnCli
     }
     public void getdata(){
 
-        Observable<PushBean> pushBeanObservable = new NetRequestUtils2().bucuo().getbaseretrofit().getpushmess(3).subscribeOn(Schedulers.io())
+        Observable<PushBean> pushBeanObservable = new NetRequestUtils2().bucuo().getbaseretrofit().getpushmess(2).subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread());
         pushBeanObservable.subscribe(new Observer<PushBean>() {
             @Override

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

@@ -155,8 +155,8 @@ public class PigHomeFragment extends PresenterFragment implements View.OnClickLi
         }
 
         //vivo渠道控制信用卡开关
-//        if (!TextUtils.isEmpty(BuildConfig.CHANNLE) && BuildConfig.CHANNLE.equals("30073"))
-//            cardvisible();
+        if (!TextUtils.isEmpty(BuildConfig.CHANNLE) && BuildConfig.CHANNLE.equals("1003"))
+            cardvisible();
         //滚动文字
         getlapview();
 //        //banner
@@ -446,12 +446,10 @@ public class PigHomeFragment extends PresenterFragment implements View.OnClickLi
                 if(o!=null){
                     final List<Allbanner.RstBean.HomeactBean> homeact = o.rst.homeact;
                     if(homeact!=null&&homeact.size()>0){
-
                         banner.setData(homeact,null);
                         banner.loadImage(new XBanner.XBannerAdapter() {
                             @Override
                             public void loadBanner(XBanner banner, Object model, View view, int position2) {
-
                                 Glide.with(getActivity()).load(homeact.get(position2).photo).into((ImageView) view);
                             }
                         });

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

@@ -57,6 +57,20 @@
                     android:gravity="center"
                     android:visibility="gone"
                     />
+                <TextView
+                    android:id="@+id/pri_title2"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:paddingLeft="5px"
+                    android:paddingRight="5px"
+                    android:text="通过率高"
+                    android:textColor="#FB4F4F"
+                    android:textSize="9px"
+                    android:layout_marginLeft="9px"
+                    android:background="@drawable/hotback"
+                    android:gravity="center"
+                    android:visibility="gone"
+                    />
             </LinearLayout>
             <TextView
                 android:id="@+id/hot_destory"

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

@@ -59,6 +59,20 @@
                     android:paddingRight="5px"
                     android:visibility="gone"
                     />
+                <TextView
+                    android:id="@+id/pri_title2"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="通过率高"
+                    android:textColor="#FB4F4F"
+                    android:textSize="9px"
+                    android:layout_marginLeft="9px"
+                    android:background="@drawable/hotback"
+                    android:gravity="center"
+                    android:paddingLeft="5px"
+                    android:paddingRight="5px"
+                    android:visibility="gone"
+                    />
             </LinearLayout>
             <TextView
                 android:id="@+id/hot_destory"

factory/src/main/java/com/smileflowpig/money/factory/netword/Baseretrofit.java

@@ -189,6 +189,7 @@ public interface Baseretrofit {
     @POST("/user/product/addCollection")
     @FormUrlEncoded
     Observable<CollectBean> getcollect(@Field("product_id") String id);
+
     //取消收藏
     @POST("/user/product/cancelCollection")
     @FormUrlEncoded
@@ -210,6 +211,7 @@ public interface Baseretrofit {
     Observable<Object> getmemoadd(@Field("platform_id") String platid, @Field("how_to_use") String use,
                                   @Field("how_much") String much, @Field("how_long") String longer,
                                   @Field("due_date") String data, @Field("gross_interest") String interest);
+
     //删除备忘录
     @POST("/user/huaJiangHu/delMemo")
     @FormUrlEncoded
@@ -277,7 +279,7 @@ public interface Baseretrofit {
     //完善身份证信息
     @POST("/user/v2/huaUser/userUpdate")
     @FormUrlEncoded
-    Observable<Object> getalltext(@Field("idcard_no") String idcard,@Field("real_name") String name);
+    Observable<Object> getalltext(@Field("idcard_no") String idcard, @Field("real_name") String name);
 
     //完善支付宝
     @POST("/user/v2/huaUser/userUpdate")
@@ -295,7 +297,7 @@ public interface Baseretrofit {
     //提现操作
     @POST("/user/v2/huaUser/doWithdrawal")
     @FormUrlEncoded
-    Observable<Object> getmoney(@Field("real_name") String name,@Field("alipay_id") String phone,@Field("money") String money);
+    Observable<Object> getmoney(@Field("real_name") String name, @Field("alipay_id") String phone, @Field("money") String money);
 
     //提现记录
     @POST("/user/v2/huaUser/withdrawalList")

factory/src/main/java/com/smileflowpig/money/factory/netword/NetRequestUtils2.java

@@ -66,7 +66,7 @@ public class NetRequestUtils2 {
 
         //http://ads.726p.com/api/    //线上
         //http://182.92.118.1:8070/api/           //测试
-                Retrofit.Builder retrofit = new Retrofit.Builder().baseUrl("http://182.92.118.1:8070/api/").client(okHttpClient.build());
+                Retrofit.Builder retrofit = new Retrofit.Builder().baseUrl("http://ads.726p.com/api/").client(okHttpClient.build());
         retrofit.addConverterFactory(GsonConverterFactory.create()).addCallAdapterFactory(RxJava2CallAdapterFactory.create());
 
 //        Baseretrofit baseretrofit =