修改banner和对接我的报名

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

@@ -147,6 +147,16 @@ public class LoginPhoneCodeActivity extends TitleBarActivity implements VerifyCo
         });
 
         /**
+         * 忘记密码
+         */
+        tvForgetPw.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                startActivity(new Intent(LoginPhoneCodeActivity.this, FindPasswordActivity.class));
+            }
+        });
+
+        /**
          * 微信登陆
          */
         rlLoginWx.setOnClickListener(new View.OnClickListener() {

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

@@ -16,7 +16,6 @@ import android.widget.ArrayAdapter;
 import android.widget.GridView;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
-import android.widget.ListView;
 import android.widget.RelativeLayout;
 import android.widget.ScrollView;
 import android.widget.TextView;
@@ -93,19 +92,26 @@ public class OrgDetailActivity extends TitleBarActivity {
     ImageView ivShare;
     @Bind(R.id.ll_comment_main)
     LinearLayout llCommentMain;
-    @Bind(R.id.gv_service)
-    ScrollViewWithGridView gvService;
+    @Bind(R.id.tv_service)
+    TextView tvService;
     @Bind(R.id.ll_org_service)
     LinearLayout llOrgService;
     @Bind(R.id.ll_recommend_main)
     LinearLayout llRecommendMain;
     @Bind(R.id.sv_main)
     ScrollView svMain;
+    @Bind(R.id.ll_collect)
+    LinearLayout llCollect;
+    @Bind(R.id.ll_point_main)
+    LinearLayout llPointMain;
 
     private int memberId;
     private boolean isCollect;
     private OrgDetailBean.DataBean dataBean;
+
     private int bannerIndex;
+    private List<ImageView> listPointView;
+    private int pointIndex;
 
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
@@ -213,13 +219,31 @@ public class OrgDetailActivity extends TitleBarActivity {
         lvRecent.setOnItemClickListener(new AdapterView.OnItemClickListener() {
             @Override
             public void onItemClick(AdapterView<?> adapterView, View view, int i, long l) {
-                if(dataBean != null && dataBean.getRecentList().size() > 0) {
+                if (dataBean != null && dataBean.getRecentList().size() > 0) {
                     Intent intent = new Intent(OrgDetailActivity.this, OrgDetailActivity.class);
                     intent.putExtra("memberId", dataBean.getRecentList().get(i).getMemberId());
                     startActivity(intent);
                 }
             }
         });
+
+        vpBanner.addOnPageChangeListener(new ViewPager.OnPageChangeListener() {
+            @Override
+            public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
+
+            }
+
+            @Override
+            public void onPageSelected(int position) {
+                pointIndex = position;
+                refreshPointView();
+            }
+
+            @Override
+            public void onPageScrollStateChanged(int state) {
+
+            }
+        });
     }
 
     /**
@@ -254,7 +278,7 @@ public class OrgDetailActivity extends TitleBarActivity {
                         showToast(orgDetailBean.getMsg());
                     }
                 }
-                if(isScollTop){
+                if (isScollTop) {
                     svMain.smoothScrollTo(0, 0);
                 }
             }
@@ -293,10 +317,7 @@ public class OrgDetailActivity extends TitleBarActivity {
         //特色服务
         if (!TextUtils.isEmpty(dataBean.getService())) {
             llOrgService.setVisibility(View.VISIBLE);
-            ArrayAdapter<String> mOrgDetailServiceAdapter = new ArrayAdapter<String>(OrgDetailActivity.this,
-                    R.layout.org_detail_service_item, dataBean.getService().split("\\|"));
-            gvService.setAdapter(mOrgDetailServiceAdapter);
-            mOrgDetailServiceAdapter.notifyDataSetChanged();
+            tvService.setText(dataBean.getService());
         } else {
             llOrgService.setVisibility(View.GONE);
         }
@@ -385,7 +406,52 @@ public class OrgDetailActivity extends TitleBarActivity {
             vpBanner.setAdapter(adapter);
             vpBanner.setCurrentItem(bannerIndex);
             adapter.notifyDataSetChanged();
-            handler.sendEmptyMessage(0);
+            initPointView();
+//            handler.sendEmptyMessage(0);
+        }
+    }
+
+    /**
+     * 初始化焦点View
+     */
+    private void initPointView(){
+        if(dataBean == null || dataBean.getShowPicList() == null || dataBean.getShowPicList().size() == 0) {
+            return;
+        }
+        int showPicSize = dataBean.getShowPicList().size();
+        if(showPicSize > 0){
+            listPointView = new ArrayList<>();
+            for(int i=0; i< showPicSize; i++) {
+                ImageView imageView = new ImageView(this);
+                imageView.setImageResource(R.drawable.banner_point_nomal);
+                LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(15, 15);
+                params.rightMargin = 10;
+                imageView.setLayoutParams(params);
+                listPointView.add(imageView);
+                llPointMain.addView(imageView);
+            }
+            refreshPointView();
+        }
+    }
+
+    /**
+     * 刷新焦点图片
+     */
+    private void refreshPointView(){
+        if(dataBean == null || dataBean.getShowPicList() == null || dataBean.getShowPicList().size() == 0) {
+            return;
+        }
+        if(pointIndex >= dataBean.getShowPicList().size()) {
+            pointIndex = 0;
+        }
+        if(listPointView != null && dataBean.getShowPicList().size() > 0){
+            for(int i=0; i<listPointView.size(); i++){
+                if(i == pointIndex) {
+                    listPointView.get(i).setImageResource(R.drawable.banner_point_press);
+                } else {
+                    listPointView.get(i).setImageResource(R.drawable.banner_point_nomal);
+                }
+            }
         }
     }
 
@@ -396,6 +462,7 @@ public class OrgDetailActivity extends TitleBarActivity {
             switch (msg.what) {
                 case 0:
                     bannerIndex++;
+                    pointIndex++;
                     if (bannerIndex < dataBean.getShowPicList().size()) {
                         vpBanner.setCurrentItem(bannerIndex);
                     } else {

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

@@ -0,0 +1,79 @@
+package com.ynstkz.shitu.android.adapter;
+
+import android.content.Context;
+import android.graphics.Paint;
+import android.text.TextUtils;
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import com.bumptech.glide.Glide;
+import com.common.library.adapter.CCAdapterHolder;
+import com.common.library.adapter.CCListAdapter;
+import com.ynstkz.shitu.android.R;
+import com.ynstkz.shitu.android.bean.SignUpRecorsBean;
+import com.ynstkz.shitu.android.data.UrlCat;
+
+import java.util.List;
+
+/**
+ * 作者：fuchangle on 2018/4/23 10:32
+ */
+
+public class MineSignUpAdapter extends CCListAdapter<SignUpRecorsBean>{
+
+    private Context context;
+
+    public MineSignUpAdapter(Context context, List<SignUpRecorsBean> adapterContent) {
+        super(context, adapterContent);
+        this.context = context;
+    }
+
+    @Override
+    public CCAdapterHolder<SignUpRecorsBean> createHolder(int type) {
+        return new CCAdapterHolder<SignUpRecorsBean>() {
+
+            ImageView ivHeadPic;
+            TextView tvMemberName;
+            TextView tvCourseName;
+            TextView tvRegaddress;
+            TextView tvCoursePrice;
+            TextView tvCourseMarketprice;
+
+
+            @Override
+            public int getResource() {
+                return R.layout.item_mine_signup;
+            }
+
+            @Override
+            public void initializeView(View convertView) {
+                ivHeadPic = convertView.findViewById(R.id.iv_headPic);
+                tvMemberName = convertView.findViewById(R.id.tv_memberName);
+                tvCourseName = convertView.findViewById(R.id.tv_course_name);
+                tvRegaddress = convertView.findViewById(R.id.tv_regaddress);
+                tvCoursePrice = convertView.findViewById(R.id.tv_course_price);
+                tvCourseMarketprice = convertView.findViewById(R.id.tv_course_marketprice);
+            }
+
+            @Override
+            public void updateView(SignUpRecorsBean content, int position) {
+                if(!TextUtils.isEmpty(content.getCoursePic())) {
+                    if(content.getCoursePic().startsWith("http")) {
+                        Glide.with(context).load(content.getCoursePic()).into(ivHeadPic);
+                    } else {
+                        Glide.with(context).load(UrlCat.HOST + content.getCoursePic()).into(ivHeadPic);
+                    }
+                } else {
+                    ivHeadPic.setImageResource(R.drawable.org_item_default_icon);
+                }
+                tvMemberName.setText(content.getMemberName());
+                tvCourseName.setText(content.getTitle());
+                tvRegaddress.setText(content.getAddress());
+                tvCoursePrice.setText("￥" + content.getPrice());
+                tvCourseMarketprice.setText(content.getMarketPrice() + "");
+                tvCourseMarketprice.getPaint().setFlags(Paint.STRIKE_THRU_TEXT_FLAG);
+            }
+        };
+    }
+}

app/src/main/java/com/ynstkz/shitu/android/bean/MineSignUpItemBean.java

@@ -37,7 +37,7 @@ public class MineSignUpItemBean extends BaseBean{
         private Object condition;
         private boolean asc;
         private int offsetCurrent;
-        private List<?> records;
+        private List<SignUpRecorsBean> records;
 
         public int getOffset() {
             return offset;
@@ -143,11 +143,11 @@ public class MineSignUpItemBean extends BaseBean{
             this.offsetCurrent = offsetCurrent;
         }
 
-        public List<?> getRecords() {
+        public List<SignUpRecorsBean> getRecords() {
             return records;
         }
 
-        public void setRecords(List<?> records) {
+        public void setRecords(List<SignUpRecorsBean> records) {
             this.records = records;
         }
     }

app/src/main/java/com/ynstkz/shitu/android/bean/SignUpRecorsBean.java

@@ -0,0 +1,156 @@
+package com.ynstkz.shitu.android.bean;
+
+import com.ynstkz.shitu.android.base.BaseBean;
+
+/**
+ * 作者：fuchangle on 2018/4/23 10:20
+ */
+
+public class SignUpRecorsBean extends BaseBean{
+
+
+    private int marketPrice;
+    private String address;
+    private String memberName;
+    private String lon;
+    private String title;
+    private int userId;
+    private int studentInfoId;
+    private int applyId;
+    private int score;
+    private String coursePic;
+    private long createTime;
+    private int price;
+    private int courseId;
+    private String applyStatus;
+    private String lat;
+    private int memberId;
+
+    public int getMarketPrice() {
+        return marketPrice;
+    }
+
+    public void setMarketPrice(int marketPrice) {
+        this.marketPrice = marketPrice;
+    }
+
+    public String getAddress() {
+        return address;
+    }
+
+    public void setAddress(String address) {
+        this.address = address;
+    }
+
+    public String getMemberName() {
+        return memberName;
+    }
+
+    public void setMemberName(String memberName) {
+        this.memberName = memberName;
+    }
+
+    public String getLon() {
+        return lon;
+    }
+
+    public void setLon(String lon) {
+        this.lon = lon;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public int getUserId() {
+        return userId;
+    }
+
+    public void setUserId(int userId) {
+        this.userId = userId;
+    }
+
+    public int getStudentInfoId() {
+        return studentInfoId;
+    }
+
+    public void setStudentInfoId(int studentInfoId) {
+        this.studentInfoId = studentInfoId;
+    }
+
+    public int getApplyId() {
+        return applyId;
+    }
+
+    public void setApplyId(int applyId) {
+        this.applyId = applyId;
+    }
+
+    public int getScore() {
+        return score;
+    }
+
+    public void setScore(int score) {
+        this.score = score;
+    }
+
+    public String getCoursePic() {
+        return coursePic;
+    }
+
+    public void setCoursePic(String coursePic) {
+        this.coursePic = coursePic;
+    }
+
+    public long getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(long createTime) {
+        this.createTime = createTime;
+    }
+
+    public int getPrice() {
+        return price;
+    }
+
+    public void setPrice(int price) {
+        this.price = price;
+    }
+
+    public int getCourseId() {
+        return courseId;
+    }
+
+    public void setCourseId(int courseId) {
+        this.courseId = courseId;
+    }
+
+    public String getApplyStatus() {
+        return applyStatus;
+    }
+
+    public void setApplyStatus(String applyStatus) {
+        this.applyStatus = applyStatus;
+    }
+
+    public String getLat() {
+        return lat;
+    }
+
+    public void setLat(String lat) {
+        this.lat = lat;
+    }
+
+    public int getMemberId() {
+        return memberId;
+    }
+
+    public void setMemberId(int memberId) {
+        this.memberId = memberId;
+    }
+}

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

@@ -15,10 +15,15 @@ import com.common.library.pulltorefresh.PullToRefreshBase;
 import com.common.library.pulltorefresh.PullToRefreshListView;
 import com.google.gson.Gson;
 import com.ynstkz.shitu.android.R;
+import com.ynstkz.shitu.android.adapter.MineSignUpAdapter;
 import com.ynstkz.shitu.android.base.BaseFragment;
 import com.ynstkz.shitu.android.bean.MineSignUpItemBean;
+import com.ynstkz.shitu.android.bean.SignUpRecorsBean;
 import com.ynstkz.shitu.android.data.RequestGroup;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import butterknife.Bind;
 import butterknife.ButterKnife;
 import okhttp3.Call;
@@ -45,6 +50,8 @@ public class MineSignUpItemFragment extends BaseFragment implements PullToRefres
 
     private String status;
     private int pageNumber;
+    private List<SignUpRecorsBean> listSignUpRecors;
+    private MineSignUpAdapter adapter;
 
     @Nullable
     @Override
@@ -89,7 +96,7 @@ public class MineSignUpItemFragment extends BaseFragment implements PullToRefres
      * @param pageNumber
      * @param signUpStatus
      */
-    private void getMineSignUp(int pageNumber, String signUpStatus) {
+    private void getMineSignUp(final int pageNumber, String signUpStatus) {
 
         RequestGroup.getMineSignup(pageNumber + "", signUpStatus, new Callback() {
             @Override
@@ -109,7 +116,19 @@ public class MineSignUpItemFragment extends BaseFragment implements PullToRefres
                     if("200".equals(mineSignUpItemBean.getCode())){
                         if(mineSignUpItemBean.getData() != null){
                             if(mineSignUpItemBean.getData().getRecords() != null && mineSignUpItemBean.getData().getRecords().size() > 0){
-
+                                if(pageNumber == 1) {
+                                    if(listSignUpRecors == null) {
+                                        listSignUpRecors = new ArrayList<>();
+                                    }
+                                    listSignUpRecors.clear();
+                                    listSignUpRecors.addAll(mineSignUpItemBean.getData().getRecords());
+                                    adapter = new MineSignUpAdapter(getActivity(), listSignUpRecors);
+                                    pullToRefresh.setAdapter(adapter);
+                                    adapter.notifyDataSetChanged();
+                                } else {
+                                    listSignUpRecors.addAll(mineSignUpItemBean.getData().getRecords());
+                                    adapter.notifyDataSetChanged();
+                                }
                             } else {
                                 showNoData();
                             }

app/src/main/res/layout/activity_find_pwd.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/activity_org_detail.xml

@@ -41,7 +41,8 @@
             android:layout_alignParentRight="true"
             android:layout_centerVertical="true"
             android:paddingRight="@dimen/company_20dp"
-            android:orientation="horizontal">
+            android:orientation="horizontal"
+            android:background="@color/default_bg">
 
             <ImageView
                 android:id="@+id/iv_collect"
@@ -81,6 +82,16 @@
                     android:layout_width="match_parent"
                     android:layout_height="match_parent" />
 
+                <LinearLayout
+                    android:id="@+id/ll_point_main"
+                    android:layout_width="wrap_content"
+                    android:layout_height="@dimen/company_20dp"
+                    android:layout_alignParentRight="true"
+                    android:layout_alignParentBottom="true"
+                    android:layout_marginBottom="@dimen/company_5dp"
+                    android:layout_marginRight="@dimen/company_20dp"
+                    android:orientation="horizontal"/>
+
             </RelativeLayout>
 
             <LinearLayout
@@ -186,12 +197,12 @@
                     android:textColor="@color/color_333"
                     android:textSize="@dimen/company_16sp" />
 
-                <com.ynstkz.shitu.android.view.ScrollViewWithGridView
-                    android:id="@+id/gv_service"
+                <TextView
+                    android:id="@+id/tv_service"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="@dimen/company_5dp"
-                    android:numColumns="4"/>
+                    android:numColumns="3"/>
 
             </LinearLayout>
 

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

@@ -0,0 +1,104 @@
+<?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"
+    android:background="@color/white">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:padding="10dp">
+
+        <ImageView
+            android:id="@+id/iv_headPic"
+            android:layout_width="@dimen/company_80dp"
+            android:layout_height="@dimen/company_80dp"/>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/company_80dp"
+            android:layout_marginLeft="@dimen/company_10dp"
+            android:orientation="vertical">
+
+            <TextView
+                android:id="@+id/tv_memberName"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:maxLines="1"
+                android:ellipsize="end"
+                android:textSize="@dimen/company_16sp"
+                android:textColor="@color/color_333"
+                android:textStyle="bold"
+                android:text="新东方培训学校-西湖文化广场分校"/>
+
+            <RelativeLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/company_5dp">
+
+                <TextView
+                    android:id="@+id/tv_course_name"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginRight="@dimen/company_5dp"
+                    android:textSize="@dimen/company_14sp"
+                    android:textColor="@color/color_999"/>
+
+                <TextView
+                    android:id="@+id/tv_regaddress"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_toRightOf="@+id/tv_course_name"
+                    android:layout_alignParentRight="true"
+                    android:maxLines="1"
+                    android:ellipsize="end"
+                    android:gravity="right"
+                    android:text="未名湖"/>
+
+            </RelativeLayout>
+
+            <LinearLayout
+                android:id="@+id/ll_price_main"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                android:layout_marginTop="@dimen/company_5dp">
+
+                <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="1000"/>
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="bottom"
+                    android:layout_marginLeft="@dimen/company_10dp"
+                    android:textColor="@color/color_999"
+                    android:textSize="11sp"
+                    android:text="市场价"/>
+
+                <TextView
+                    android:id="@+id/tv_course_marketprice"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="bottom"
+                    android:textColor="@color/color_999"
+                    android:textSize="11sp"
+                    android:text="1500"/>
+
+            </LinearLayout>
+
+        </LinearLayout>
+
+    </LinearLayout>
+
+    <include layout="@layout/view_default_line"/>
+
+</LinearLayout>