修改机构列表ui

app/src/main/java/com/ynstkz/shitu/android/activity/HomeActivity.java

@@ -252,11 +252,6 @@ public class HomeActivity extends TitleBarActivity implements AMapLocationListen
     }
 
     @Subscribe(threadMode = ThreadMode.MAIN)
-    public void onMessageEvent(LoginEvent event) {
-        changleLayout(2);
-    }
-
-    @Subscribe(threadMode = ThreadMode.MAIN)
     public void onMessageEvent(LogoutEvent event) {
         changleLayout(0);
     }

app/src/main/java/com/ynstkz/shitu/android/adapter/OrgListAdapter.java

@@ -1,14 +1,19 @@
 package com.ynstkz.shitu.android.adapter;
 
 import android.content.Context;
+import android.content.Intent;
 import android.text.TextUtils;
+import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.ImageView;
+import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import com.common.library.adapter.CCAdapterHolder;
 import com.common.library.adapter.CCListAdapter;
 import com.ynstkz.shitu.android.R;
+import com.ynstkz.shitu.android.activity.CourseDetailActivity;
+import com.ynstkz.shitu.android.bean.CourseItemBean;
 import com.ynstkz.shitu.android.bean.OrgItemBean;
 
 import java.util.List;
@@ -40,6 +45,7 @@ public class OrgListAdapter extends CCListAdapter<OrgItemBean> {
             MaterialRatingBar rb_score;
             TextView tv_regaddress;
             TextView tvViewCount;
+            LinearLayout llCourseMain;
 
             @Override
             public int getResource() {
@@ -53,6 +59,7 @@ public class OrgListAdapter extends CCListAdapter<OrgItemBean> {
                 rb_score = convertView.findViewById(R.id.rb_score);
                 tv_regaddress = convertView.findViewById(R.id.tv_regaddress);
                 tvViewCount = convertView.findViewById(R.id.tv_view_count);
+                llCourseMain = convertView.findViewById(R.id.ll_course_main);
             }
 
             @Override
@@ -66,6 +73,36 @@ public class OrgListAdapter extends CCListAdapter<OrgItemBean> {
                 } else {
                     tv_regaddress.setVisibility(View.GONE);
                 }
+
+                //课程信息
+                if (content.getCourseList() != null && content.getCourseList().size() > 0) {
+                    llCourseMain.setVisibility(View.VISIBLE);
+                    llCourseMain.removeAllViews();
+                    for (int j = 0; j < content.getCourseList().size(); j++) {
+                        View courseView = LayoutInflater.from(context).inflate(R.layout.item_org_course_list, null);
+                        TextView tvCourseTitle = courseView.findViewById(R.id.tv_course_title);
+                        TextView tvCoursePrice = courseView.findViewById(R.id.tv_course_price);
+                        TextView tvCourseMarketprice = courseView.findViewById(R.id.tv_course_marketprice);
+
+                        final CourseItemBean courseItemBean = content.getCourseList().get(j);
+                        tvCourseTitle.setText(courseItemBean.getTitle());
+                        tvCoursePrice.setText("￥" + courseItemBean.getPrice());
+                        tvCourseMarketprice.setText("￥" + courseItemBean.getMarketPrice());
+
+                        //课程详情
+                        courseView.setOnClickListener(new View.OnClickListener() {
+                            @Override
+                            public void onClick(View view) {
+                                Intent intent = new Intent(context, CourseDetailActivity.class);
+                                intent.putExtra("courseId", courseItemBean.getCourseId());
+                                context.startActivity(intent);
+                            }
+                        });
+                        llCourseMain.addView(courseView);
+                    }
+                } else {
+                    llCourseMain.setVisibility(View.GONE);
+                }
             }
         };
     }

app/src/main/java/com/ynstkz/shitu/android/fragment/HomeFragment.java

@@ -120,6 +120,8 @@ public class HomeFragment extends BaseFragment implements PullToRefreshBase.OnRe
     }
 
     private void initData() {
+        //初始化缓存数据
+        initCacheData();
         //获取banner
         getBannerData();
         //获取机构导航
@@ -218,6 +220,28 @@ public class HomeFragment extends BaseFragment implements PullToRefreshBase.OnRe
     }
 
     /**
+     * 初始化缓存数据
+     */
+    private void initCacheData(){
+        //初始化banner
+
+        //获取机构导航数据
+        Cache<OrgNavigationBean> cacheNavigation = new Cache<>();
+        OrgNavigationBean orgNavigationBean = cacheNavigation.get("OrgNavigationBean");
+        if(orgNavigationBean != null){
+            if("200".equals(orgNavigationBean.getCode())){
+                if(orgNavigationBean.getData() != null && orgNavigationBean.getData().size() > 0){
+                    orgNavigationGridAdapter = new OrgNavigationGridAdapter(getActivity(), orgNavigationBean.getData());
+                    gvCourseNavigation.setAdapter(orgNavigationGridAdapter);
+                    orgNavigationGridAdapter.notifyDataSetChanged();
+                }
+            } else {
+                showToast(orgNavigationBean.getMsg());
+            }
+        }
+    }
+
+    /**
      * 获取banner数据
      */
     private void getBannerData() {
@@ -239,7 +263,7 @@ public class HomeFragment extends BaseFragment implements PullToRefreshBase.OnRe
                 if (bannerBean != null) {
                     if ("200".equals(bannerBean.getCode())) {
                         if (bannerBean.getData() != null) {
-                            listBanner = bannerBean.getData();;
+                            listBanner = bannerBean.getData();
                             initBannerView();
                         }
                     } else {
@@ -356,7 +380,7 @@ public class HomeFragment extends BaseFragment implements PullToRefreshBase.OnRe
                 llCourseMain.setVisibility(View.VISIBLE);
                 llCourseMain.removeAllViews();
                 for (int j = 0; j < orgItemBean.getCourseList().size(); j++) {
-                    View courseView = LayoutInflater.from(getActivity()).inflate(R.layout.item_org_course_list, null);
+                    View courseView = LayoutInflater.from(getActivity()).inflate(R.layout.item_org_course_recommend_list, null);
                     TextView tvCourseTitle = courseView.findViewById(R.id.tv_course_title);
                     TextView tvCoursePrice = courseView.findViewById(R.id.tv_course_price);
                     TextView tvCourseMarketprice = courseView.findViewById(R.id.tv_course_marketprice);

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

@@ -66,7 +66,7 @@
             android:layout_height="@dimen/company_50dp"
             android:layout_marginTop="@dimen/company_10dp"
             android:background="@drawable/shapre_default_edit_bg"
-            android:hint="请输入用户名称/手机号/邮箱"
+            android:hint="请输入手机号"
             android:maxLines="1"
             android:textCursorDrawable="@null"
             android:textSize="@dimen/company_14sp" />

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

@@ -122,15 +122,15 @@
         <com.common.library.pulltorefresh.PullToRefreshListView
             android:id="@+id/pullToRefresh"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"/>
+            android:layout_height="match_parent"
+            android:divider="@null"/>
 
         <LinearLayout
             android:id="@+id/ll_filter_content"
             android:visibility="gone"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:background="@color/translucence"
-            >
+            android:background="@color/translucence">
 
             <ListView
                 android:id="@+id/lv_filter_content"

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

@@ -4,6 +4,10 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
 
+    <include
+        android:id="@+id/include_course_line"
+        layout="@layout/view_default_line"/>
+
     <RelativeLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -14,7 +18,6 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_centerVertical="true"
-            android:layout_toLeftOf="@+id/ll_price_main"
             android:layout_alignParentLeft="true"
             android:singleLine="true"
             android:ellipsize="end"
@@ -22,11 +25,12 @@
             android:textSize="@dimen/company_14sp"
             android:text="成人英语12课时特惠班-送2课时"/>
 
-        <LinearLayout
+        <RelativeLayout
             android:id="@+id/ll_price_main"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:orientation="vertical"
+            android:orientation="horizontal"
+            android:layout_centerVertical="true"
             android:layout_alignParentRight="true">
 
             <TextView
@@ -34,28 +38,22 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="right"
+                android:layout_toLeftOf="@+id/tv_course_marketprice"
                 android:textSize="@dimen/company_20sp"
-                android:textColor="#ff695c"
-                android:text="$20"/>
+                android:textColor="#ff695c"/>
 
             <TextView
                 android:id="@+id/tv_course_marketprice"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_gravity="right"
-                android:layout_marginTop="@dimen/company_10dp"
+                android:gravity="center_vertical"
+                android:layout_alignParentRight="true"
+                android:layout_alignBottom="@+id/tv_course_price"
                 android:textColor="@color/color_999"
-                android:textSize="11sp"
-                android:text="市场价：￥34"/>
+                android:textSize="11sp"/>
 
-
-        </LinearLayout>
+        </RelativeLayout>
 
     </RelativeLayout>
 
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/company_1dp"
-        android:background="@color/default_bg"/>
-
 </LinearLayout>

app/src/main/res/layout/item_org_course_recommend_list.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="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <RelativeLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:padding="@dimen/default_content_margin">
+
+        <TextView
+            android:id="@+id/tv_course_title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
+            android:layout_toLeftOf="@+id/ll_price_main"
+            android:layout_alignParentLeft="true"
+            android:singleLine="true"
+            android:ellipsize="end"
+            android:textColor="@color/color_666"
+            android:textSize="@dimen/company_14sp"
+            android:text="成人英语12课时特惠班-送2课时"/>
+
+        <LinearLayout
+            android:id="@+id/ll_price_main"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:layout_alignParentRight="true">
+
+            <TextView
+                android:id="@+id/tv_course_price"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="right"
+                android:textSize="@dimen/company_20sp"
+                android:textColor="#ff695c"
+                android:text="$20"/>
+
+            <TextView
+                android:id="@+id/tv_course_marketprice"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="right"
+                android:layout_marginTop="@dimen/company_10dp"
+                android:textColor="@color/color_999"
+                android:textSize="11sp"
+                android:text="市场价：￥34"/>
+
+
+        </LinearLayout>
+
+    </RelativeLayout>
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/company_1dp"
+        android:background="@color/default_bg"/>
+
+</LinearLayout>

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

@@ -94,4 +94,6 @@
 
     </LinearLayout>
 
+    <include layout="@layout/view_default_line"/>
+
 </LinearLayout>