316044749 7 роки тому
батько
коміт
08184f9c92

+ 1 - 1
app/src/main/java/com/ynstkz/shitu/android/activity/LoginActivity.java

@@ -274,7 +274,7 @@ public class LoginActivity extends TitleBarActivity {
                 if(loginBean != null){
                     if("200".equals(loginBean.getCode())){
                         if(loginBean.getData() != null){
-                            boolean isBind = loginBean.getData().isIsBind();
+                            boolean isBind = loginBean.getData().isBind();
                             if(isBind){
                                 loginSuccess(loginBean);
                             } else {

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

@@ -308,7 +308,7 @@ public class LoginPhoneCodeActivity extends TitleBarActivity implements VerifyCo
                 if (loginBean != null) {
                     if ("200".equals(loginBean.getCode())) {
                         if (loginBean.getData() != null) {
-                            boolean isBind = loginBean.getData().isIsBind();
+                            boolean isBind = loginBean.getData().isBind();
                             if (isBind) {
                                 loginSuccess(loginBean);
                             } else {

+ 36 - 2
app/src/main/java/com/ynstkz/shitu/android/activity/MineSignUpActivity.java

@@ -78,7 +78,8 @@ public class MineSignUpActivity extends TitleBarActivity {
 
         MyPagerAdapter adapter = new MyPagerAdapter(fragmentList, getSupportFragmentManager());
         vpContent.setAdapter(adapter);
-        currentIndex = 1;
+        currentIndex = 0;
+        changeTab(currentIndex);
         vpContent.setCurrentItem(currentIndex);
     }
 
@@ -88,7 +89,40 @@ public class MineSignUpActivity extends TitleBarActivity {
 
     private void setListener(){
 
-    }
+        vpContent.addOnPageChangeListener(new ViewPager.OnPageChangeListener() {
+            @Override
+            public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
+
+            }
+
+            @Override
+            public void onPageSelected(int position) {
+                changeTab(position);
+            }
 
+            @Override
+            public void onPageScrollStateChanged(int state) {
 
+            }
+        });
+    }
+
+    private void changeTab(int index){
+        currentIndex = index;
+        tvCheckPass.setTextColor(getResources().getColor(R.color.color_666));
+        tvCheckWait.setTextColor(getResources().getColor(R.color.color_666));
+        tvCheckBack.setTextColor(getResources().getColor(R.color.color_666));
+
+        switch (index) {
+            case 0:
+                tvCheckPass.setTextColor(getResources().getColor(R.color.main_color));
+                break;
+            case 1:
+                tvCheckWait.setTextColor(getResources().getColor(R.color.main_color));
+                break;
+            case 2:
+                tvCheckBack.setTextColor(getResources().getColor(R.color.main_color));
+                break;
+        }
+    }
 }

+ 5 - 5
app/src/main/java/com/ynstkz/shitu/android/bean/LoginBean.java

@@ -36,7 +36,7 @@ public class LoginBean extends BaseBean{
         private String userName;
         private String userId;
         private String token;
-        private boolean isIsBind = true;
+        private boolean isBind = true;
 
         public String getUserName() {
             return userName;
@@ -62,12 +62,12 @@ public class LoginBean extends BaseBean{
             this.token = token;
         }
 
-        public boolean isIsBind() {
-            return isIsBind;
+        public boolean isBind() {
+            return isBind;
         }
 
-        public void setIsBind(boolean isBind) {
-            isIsBind = isBind;
+        public void setBind(boolean bind) {
+            isBind = bind;
         }
     }
 }

+ 154 - 0
app/src/main/java/com/ynstkz/shitu/android/bean/MineSignUpItemBean.java

@@ -0,0 +1,154 @@
+package com.ynstkz.shitu.android.bean;
+
+import com.google.gson.annotations.SerializedName;
+import com.ynstkz.shitu.android.base.BaseBean;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 作者:fuchangle on 2018/3/22 17:53
+ */
+
+public class MineSignUpItemBean extends BaseBean{
+
+    private DataBean data;
+
+    public DataBean getData() {
+        return data;
+    }
+
+    public void setData(DataBean data) {
+        this.data = data;
+    }
+
+    public static class DataBean implements Serializable{
+
+        private int offset;
+        private int limit;
+        private int total;
+        private int size;
+        private int pages;
+        private int current;
+        private boolean searchCount;
+        private boolean openSort;
+        private boolean optimizeCount;
+        private String orderByField;
+        private Object condition;
+        private boolean asc;
+        private int offsetCurrent;
+        private List<?> records;
+
+        public int getOffset() {
+            return offset;
+        }
+
+        public void setOffset(int offset) {
+            this.offset = offset;
+        }
+
+        public int getLimit() {
+            return limit;
+        }
+
+        public void setLimit(int limit) {
+            this.limit = limit;
+        }
+
+        public int getTotal() {
+            return total;
+        }
+
+        public void setTotal(int total) {
+            this.total = total;
+        }
+
+        public int getSize() {
+            return size;
+        }
+
+        public void setSize(int size) {
+            this.size = size;
+        }
+
+        public int getPages() {
+            return pages;
+        }
+
+        public void setPages(int pages) {
+            this.pages = pages;
+        }
+
+        public int getCurrent() {
+            return current;
+        }
+
+        public void setCurrent(int current) {
+            this.current = current;
+        }
+
+        public boolean isSearchCount() {
+            return searchCount;
+        }
+
+        public void setSearchCount(boolean searchCount) {
+            this.searchCount = searchCount;
+        }
+
+        public boolean isOpenSort() {
+            return openSort;
+        }
+
+        public void setOpenSort(boolean openSort) {
+            this.openSort = openSort;
+        }
+
+        public boolean isOptimizeCount() {
+            return optimizeCount;
+        }
+
+        public void setOptimizeCount(boolean optimizeCount) {
+            this.optimizeCount = optimizeCount;
+        }
+
+        public String getOrderByField() {
+            return orderByField;
+        }
+
+        public void setOrderByField(String orderByField) {
+            this.orderByField = orderByField;
+        }
+
+        public Object getCondition() {
+            return condition;
+        }
+
+        public void setCondition(Object condition) {
+            this.condition = condition;
+        }
+
+        public boolean isAsc() {
+            return asc;
+        }
+
+        public void setAsc(boolean asc) {
+            this.asc = asc;
+        }
+
+        public int getOffsetCurrent() {
+            return offsetCurrent;
+        }
+
+        public void setOffsetCurrent(int offsetCurrent) {
+            this.offsetCurrent = offsetCurrent;
+        }
+
+        public List<?> getRecords() {
+            return records;
+        }
+
+        public void setRecords(List<?> records) {
+            this.records = records;
+        }
+    }
+}

+ 8 - 2
app/src/main/java/com/ynstkz/shitu/android/data/SharedPreferencesUtils.java

@@ -1,5 +1,7 @@
 package com.ynstkz.shitu.android.data;
 
+import android.text.TextUtils;
+
 /**
  * 作者:fuchangle on 2018/2/5 10:42
  */
@@ -38,7 +40,9 @@ public class SharedPreferencesUtils {
      * 获取token
      */
     public static void saveToken(String token){
-        SharedPreferencesDao.set(KEY_TOKEN, token);
+        if(!TextUtils.isEmpty(token)){
+            SharedPreferencesDao.set(KEY_TOKEN, token);
+        }
     }
 
     public static String getToken(){
@@ -49,7 +53,9 @@ public class SharedPreferencesUtils {
      * 获取userId
      */
     public static void saveUserId(String userId){
-        SharedPreferencesDao.set(KEY_USERID, userId);
+        if(!TextUtils.isEmpty(userId)){
+            SharedPreferencesDao.set(KEY_USERID, userId);
+        }
     }
 
     public static String getUserId(){

+ 62 - 9
app/src/main/java/com/ynstkz/shitu/android/fragment/MineSignUpItemFragment.java

@@ -5,11 +5,18 @@ import android.support.annotation.Nullable;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.ListView;
+import android.widget.RelativeLayout;
+import android.widget.TextView;
 
 import com.common.library.okhttp.callback.Callback;
+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.base.BaseFragment;
+import com.ynstkz.shitu.android.bean.MineSignUpItemBean;
 import com.ynstkz.shitu.android.data.RequestGroup;
 
 import butterknife.Bind;
@@ -21,7 +28,7 @@ import okhttp3.Response;
  * 作者:fuchangle on 2018/3/2 17:32
  */
 
-public class MineSignUpItemFragment extends BaseFragment {
+public class MineSignUpItemFragment extends BaseFragment implements PullToRefreshBase.OnRefreshListener2<ListView>{
 
     public static final String STATUS_PASS = "pass";
     public static final String STATUS_WAIT = "wait";
@@ -29,6 +36,12 @@ public class MineSignUpItemFragment extends BaseFragment {
 
     @Bind(R.id.pullToRefresh)
     PullToRefreshListView pullToRefresh;
+    @Bind(R.id.iv_nodata_icon)
+    ImageView ivNodataIcon;
+    @Bind(R.id.tv_nodata_lab)
+    TextView tvNodataLab;
+    @Bind(R.id.rl_nodata)
+    RelativeLayout rlNodata;
 
     private String status;
     private int pageNumber;
@@ -44,40 +57,70 @@ public class MineSignUpItemFragment extends BaseFragment {
         return view;
     }
 
-    private void initView(){
+    private void initView() {
+        pullToRefresh.setOnRefreshListener(this);
+    }
+
+    private void initData() {
+        pageNumber = 1;
+        getMineSignUp(pageNumber, status);
+    }
+
+    private void setListener() {
 
     }
 
-    private void initData(){
+    @Override
+    public void onPullDownToRefresh(PullToRefreshBase<ListView> refreshView) {
         pageNumber = 1;
         getMineSignUp(pageNumber, status);
     }
 
-    private void setListener(){
 
+    @Override
+    public void onPullUpToRefresh(PullToRefreshBase<ListView> refreshView) {
+        pageNumber ++;
+        getMineSignUp(pageNumber, status);
     }
 
     /**
      * 我的报名
+     *
      * @param pageNumber
      * @param signUpStatus
      */
-    private void getMineSignUp(int pageNumber, String signUpStatus){
+    private void getMineSignUp(int pageNumber, String signUpStatus) {
 
-        RequestGroup.getMineSignup(pageNumber+"", signUpStatus, new Callback() {
+        RequestGroup.getMineSignup(pageNumber + "", signUpStatus, new Callback() {
             @Override
             public Object parseNetworkResponse(Response response, int id) throws Exception {
-                return null;
+                return new Gson().fromJson(response.body().string(), MineSignUpItemBean.class);
             }
 
             @Override
             public void onError(Call call, Exception e, int id) {
-
+                showNoData();
             }
 
             @Override
             public void onResponse(Object response, int id) {
-
+                MineSignUpItemBean mineSignUpItemBean = (MineSignUpItemBean)response;
+                if(mineSignUpItemBean != null) {
+                    if("200".equals(mineSignUpItemBean.getCode())){
+                        if(mineSignUpItemBean.getData() != null){
+                            if(mineSignUpItemBean.getData().getRecords() != null && mineSignUpItemBean.getData().getRecords().size() > 0){
+
+                            } else {
+                                showNoData();
+                            }
+                        } else {
+                            showNoData();
+                        }
+                    } else {
+                        showToast(mineSignUpItemBean.getMsg());
+                    }
+                }
+                pullToRefresh.onRefreshComplete();
             }
         });
     }
@@ -90,6 +133,16 @@ public class MineSignUpItemFragment extends BaseFragment {
         this.status = status;
     }
 
+    /**
+     * 显示无数据
+     */
+    private void showNoData() {
+        pullToRefresh.setVisibility(View.GONE);
+        rlNodata.setVisibility(View.VISIBLE);
+        ivNodataIcon.setImageResource(R.drawable.nodata_apply);
+        tvNodataLab.setText(getString(R.string.nodata_apply));
+    }
+
     @Override
     public void onDestroyView() {
         super.onDestroyView();

+ 14 - 3
app/src/main/res/layout/fm_minesignup_item.xml

@@ -1,11 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical" android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
 
     <com.common.library.pulltorefresh.PullToRefreshListView
         android:id="@+id/pullToRefresh"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"/>
+        android:layout_height="match_parent" />
+
+    <RelativeLayout
+        android:id="@+id/rl_nodata"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:visibility="gone">
+
+        <include layout="@layout/view_nodata" />
+
+    </RelativeLayout>
 
 </LinearLayout>

+ 1 - 0
app/src/main/res/values/strings.xml

@@ -10,6 +10,7 @@
     <string name="nodata_msg">亲,你还没有通知哦~</string>
     <string name="nodata_collect">亲,你还没有收藏哦~</string>
     <string name="nodata_comment">亲,你还没有评论哦~</string>
+    <string name="nodata_apply">亲,你还没有报名哦~</string>
 
     <string name="token_error">登录过期,请重新登录</string>
 </resources>