From 9ef200d2706bbdd84aba779f0105a6ea17c17bc1 Mon Sep 17 00:00:00 2001
From: 陶汉栋 <2821744554@qq.com>
Date: Tue, 20 Mar 2018 17:26:09 +0800
Subject: [PATCH] no message

---
 app/src/main/java/com/shunzhi/parent/ui/activity/consult/ConsultTwoLevelActivity.java |  7 +++++--
 app/src/main/java/com/shunzhi/parent/ui/activity/orderdetail/OrderDetailActivity.java |  7 +++++++
 app/src/main/java/com/shunzhi/parent/ui/fragment/StartFragment.java                   | 34 +++++++++++-----------------------
 app/src/main/java/com/shunzhi/parent/ui/fragment/consult/ConsultOneLevelFragment.java |  2 +-
 app/src/main/java/com/shunzhi/parent/ui/fragment/consult/ConsultTwoLevelFragment.java |  7 +++----
 app/src/main/res/layout/item_order_list.xml                                           | 43 +++++++++++++++++++++++++++++--------------
 6 files changed, 56 insertions(+), 44 deletions(-)

diff --git a/app/src/main/java/com/shunzhi/parent/ui/activity/consult/ConsultTwoLevelActivity.java b/app/src/main/java/com/shunzhi/parent/ui/activity/consult/ConsultTwoLevelActivity.java
index 90352c3..2b4de44 100644
--- a/app/src/main/java/com/shunzhi/parent/ui/activity/consult/ConsultTwoLevelActivity.java
+++ b/app/src/main/java/com/shunzhi/parent/ui/activity/consult/ConsultTwoLevelActivity.java
@@ -23,9 +23,10 @@ import java.util.List;
 
 public class ConsultTwoLevelActivity extends BaseMVPCompatActivity implements View.OnClickListener {
 
-    public static void getInstance(Context context,String channel){
+    public static void getInstance(Context context,String channel,String titleName){
         Intent intent=new Intent(context,ConsultTwoLevelActivity.class);
         intent.putExtra("channel",channel);
+        intent.putExtra("titleName",titleName);
         context.startActivity(intent);
     }
 
@@ -33,7 +34,7 @@ public class ConsultTwoLevelActivity extends BaseMVPCompatActivity implements Vi
 
     EditText et_search;
 
-    String channel;
+    String channel,titleName;
 
     FrameLayout frame_consult_two;
 
@@ -51,6 +52,7 @@ public class ConsultTwoLevelActivity extends BaseMVPCompatActivity implements Vi
 
     private void initViews() {
         channel=getIntent().getStringExtra("channel");
+        titleName=getIntent().getStringExtra("titleName");
         ivBack = findViewById(R.id.ivBack);
         ivBack.setOnClickListener(this);
         frame_consult_two=findViewById(R.id.frame_consult_two);
@@ -63,6 +65,7 @@ public class ConsultTwoLevelActivity extends BaseMVPCompatActivity implements Vi
         consultTwoLevelFragment=new ConsultTwoLevelFragment();
         Bundle bundle=new Bundle();
         bundle.putString("channel",channel);
+        bundle.putString("titleName",titleName);
         consultTwoLevelFragment.setArguments(bundle);
         getSupportFragmentManager().beginTransaction().add(R.id.frame_consult_two,consultTwoLevelFragment)
                 .show(consultTwoLevelFragment).commit();
diff --git a/app/src/main/java/com/shunzhi/parent/ui/activity/orderdetail/OrderDetailActivity.java b/app/src/main/java/com/shunzhi/parent/ui/activity/orderdetail/OrderDetailActivity.java
index 99e3c4d..959ec19 100644
--- a/app/src/main/java/com/shunzhi/parent/ui/activity/orderdetail/OrderDetailActivity.java
+++ b/app/src/main/java/com/shunzhi/parent/ui/activity/orderdetail/OrderDetailActivity.java
@@ -156,12 +156,15 @@ public class OrderDetailActivity extends BaseMVPCompatActivity<OrderDetailContra
 
                     private TextView tvStartTIme_EndTime,tvProductName,tvPayState;
 
+                    private ImageView ivState;
+
                     public MyOrderBeanListViewHolder(View itemView) {
                         super(itemView);
                         layout_order_list=itemView.findViewById(R.id.layout_order_list);
                         tvStartTIme_EndTime=itemView.findViewById(R.id.tvStartTIme_EndTime);
                         tvProductName=itemView.findViewById(R.id.tvProductName);
                         tvPayState=itemView.findViewById(R.id.tvPayState);
+                        ivState=itemView.findViewById(R.id.ivState);
                     }
 
                     @Override
@@ -172,15 +175,19 @@ public class OrderDetailActivity extends BaseMVPCompatActivity<OrderDetailContra
                         switch (object.payState){
                             case 0://待支付
                                 tvPayState.setText("待支付");
+                                ivState.setBackgroundColor(getResources().getColor(R.color.md_red_500));
                                 break;
                             case 1://支付成功
                                 tvPayState.setText("支付成功");
+                                ivState.setImageDrawable(getResources().getDrawable(R.drawable.success));
                                 break;
                             case 2://交易关闭
                                 tvPayState.setText("交易关闭");
+                                ivState.setBackgroundColor(getResources().getColor(R.color.gray));
                                 break;
                             case 3:
                                 tvPayState.setText("支付失败");
+                                ivState.setImageDrawable(getResources().getDrawable(R.drawable.close));
                                 break;
                         }
 
diff --git a/app/src/main/java/com/shunzhi/parent/ui/fragment/StartFragment.java b/app/src/main/java/com/shunzhi/parent/ui/fragment/StartFragment.java
index 0957aed..dbc1b41 100644
--- a/app/src/main/java/com/shunzhi/parent/ui/fragment/StartFragment.java
+++ b/app/src/main/java/com/shunzhi/parent/ui/fragment/StartFragment.java
@@ -5,6 +5,7 @@ import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.v4.view.ViewPager;
 import android.text.TextUtils;
+import android.util.Log;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
@@ -87,42 +88,29 @@ public class StartFragment extends BaseMVPCompatFragment<ConsultContract.Consult
     }
 
     private void initBannes(List<GuangGaoBean> guangGaoBeanList) {
+        try {
         final List<String> imgUrl = new ArrayList<>();
         List<String> describeList = new ArrayList<>();
         for (int i = 0; i < guangGaoBeanList.size(); i++) {
-            imgUrl.add(guangGaoBeanList.get(i).fileSrc);
+            imgUrl.add(AppConfig.BASE_URL_FILE+guangGaoBeanList.get(i).fileSrc);
             describeList.add(guangGaoBeanList.get(i).describe);
         }
         xBanner.setData(imgUrl, describeList);
-        xBanner.setmAutoPlayAble(false);
-        xBanner.setSlideScrollMode(View.OVER_SCROLL_NEVER);
-
+        xBanner.stopAutoPlay();
+        xBanner.setmAutoPalyTime(10000);
+//        xBanner.setSlideScrollMode(View.OVER_SCROLL_NEVER);
+        Log.d("66666","imgUrl="+imgUrl.toString()+"describeList="+describeList.toString());
         xBanner.setmAdapter(new XBanner.XBannerAdapter() {
             @Override
             public void loadBanner(XBanner banner, Object model, View view, int position) {
-                Glide.with(getActivity()).load(AppConfig.BASE_URL_FILE+imgUrl.get(position)).placeholder(R.drawable.ic_launcher_background)
+                Glide.with(getActivity()).load(imgUrl.get(position)).placeholder(R.drawable.ic_launcher_background)
                         .into((ImageView) view);
             }
         });
 
-        xBanner.setOnPageChangeListener(new ViewPager.OnPageChangeListener() {
-            @Override
-            public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
-                if (position == imgUrl.size() - 1) {
-                    startNewActivity(MainActivity.class);
-                }
-            }
-
-            @Override
-            public void onPageSelected(int position) {
-
-            }
-
-            @Override
-            public void onPageScrollStateChanged(int state) {
-
-            }
-        });
 
+        }catch (Exception e){
+            e.printStackTrace();
+        }
     }
 }
diff --git a/app/src/main/java/com/shunzhi/parent/ui/fragment/consult/ConsultOneLevelFragment.java b/app/src/main/java/com/shunzhi/parent/ui/fragment/consult/ConsultOneLevelFragment.java
index 6aa245e..fe7fc78 100644
--- a/app/src/main/java/com/shunzhi/parent/ui/fragment/consult/ConsultOneLevelFragment.java
+++ b/app/src/main/java/com/shunzhi/parent/ui/fragment/consult/ConsultOneLevelFragment.java
@@ -140,7 +140,7 @@ public class ConsultOneLevelFragment extends BaseMVPCompatFragment<ConsultOneCon
                 @Override
                 public void onClick(View view) {
                     ChannelBean channelBean = (ChannelBean) view.getTag();
-                    ConsultTwoLevelActivity.getInstance(getActivity(), channelBean.getId() + "");
+                    ConsultTwoLevelActivity.getInstance(getActivity(), channelBean.getId() + "",channelBean.getChannelName());
                 }
             });
             layout_control.addView(textAndImgShowView);
diff --git a/app/src/main/java/com/shunzhi/parent/ui/fragment/consult/ConsultTwoLevelFragment.java b/app/src/main/java/com/shunzhi/parent/ui/fragment/consult/ConsultTwoLevelFragment.java
index 49455b7..f764122 100644
--- a/app/src/main/java/com/shunzhi/parent/ui/fragment/consult/ConsultTwoLevelFragment.java
+++ b/app/src/main/java/com/shunzhi/parent/ui/fragment/consult/ConsultTwoLevelFragment.java
@@ -36,7 +36,7 @@ public class ConsultTwoLevelFragment extends BaseMVPCompatFragment<ConsultOneCon
     MyConsultAdapter myConsultAdapter = null;
 
 
-    String channel="";
+    String channel="",titleName;
     @Override
     public int getLayoutId() {
         return R.layout.fragment_consult_two_level;
@@ -45,10 +45,9 @@ public class ConsultTwoLevelFragment extends BaseMVPCompatFragment<ConsultOneCon
     @Override
     public void initUI(View view, @Nullable Bundle savedInstanceState) {
         tvContentName = view.findViewById(R.id.tvContentName);
-        tvContentName.setText("");
-
-        recyclerView = view.findViewById(R.id.recyclerView);
+        tvContentName.setText(getArguments().getString("titleName"));
         channel=getArguments().getString("channel");
+        recyclerView = view.findViewById(R.id.recyclerView);
 
         mPresenter.getConsultContent(AppContext.getInstance().district, Integer.parseInt(channel),0,1);
     }
diff --git a/app/src/main/res/layout/item_order_list.xml b/app/src/main/res/layout/item_order_list.xml
index ba49589..2c5b164 100644
--- a/app/src/main/res/layout/item_order_list.xml
+++ b/app/src/main/res/layout/item_order_list.xml
@@ -45,20 +45,35 @@
         android:background="@drawable/shape_radius8_whit"
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
+        <LinearLayout
+            android:paddingBottom="@dimen/size_dp_5"
+            android:paddingTop="@dimen/size_dp_5"
+            android:layout_gravity="center"
+            android:gravity="center"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content">
+
+
+            <ImageView
+                android:id="@+id/ivState"
+                android:layout_width="@dimen/size_dp_20"
+                android:layout_height="@dimen/size_dp_20"
+                android:src="@drawable/success"
+                android:layout_marginRight="@dimen/size_dp_5"
+                />
+
+            <TextView
+                android:id="@+id/tvPayState"
+                android:layout_gravity="center"
+                android:drawablePadding="@dimen/size_dp_5"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="订购成功"
+                android:textColor="@color/xueqing_blue"
+                android:textSize="@dimen/textSize16"
+                android:gravity="center"
+                />
+        </LinearLayout>
 
-    <TextView
-        android:id="@+id/tvPayState"
-        android:layout_gravity="center"
-        android:drawablePadding="@dimen/size_dp_5"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="订购成功"
-        android:textColor="@color/xueqing_blue"
-        android:textSize="@dimen/textSize16"
-        android:gravity="center"
-        android:paddingBottom="@dimen/size_dp_5"
-        android:paddingTop="@dimen/size_dp_5"
-        android:drawableLeft="@drawable/order_success"
-        />
     </FrameLayout>
 </LinearLayout>
\ No newline at end of file
--
libgit2 0.21.0