Skip to content

Commit

Permalink
ui调整
Browse files Browse the repository at this point in the history
  • Loading branch information
@11hhlin1
11hhlin1 committed Aug 31, 2016
1 parent 58cc7f9 commit 11d2cb6
Show file tree
Hide file tree
Showing 50 changed files with 1,912 additions and 715 deletions.
1 change: 1 addition & 0 deletions app/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ dependencies {
compile project(':loading-more-view')
compile project(':ultra-pull-to-refresh')
compile project(':thirdAccess')
compile project(':funswitch')
compile 'com.android.support:cardview-v7:23.3.0'
compile 'com.android.support:recyclerview-v7:23.3.0'
compile 'com.bigkoo:convenientbanner:2.0.5'
Expand Down
16 changes: 11 additions & 5 deletions app/src/main/java/com/gjj/shop/community/CommunityFragment.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
import cn.finalteam.loadingviewfinal.OnDefaultRefreshListener;
import cn.finalteam.loadingviewfinal.OnLoadMoreListener;
import cn.finalteam.loadingviewfinal.PtrClassicFrameLayout;
import cn.finalteam.loadingviewfinal.PtrDefaultHandler;
import cn.finalteam.loadingviewfinal.PtrFrameLayout;
import cn.finalteam.loadingviewfinal.RecyclerViewFinal;
import okhttp3.Call;
Expand All @@ -53,7 +54,6 @@ public class CommunityFragment extends BaseFragment{
@OnClick(R.id.add_feed_btn)
void addFeed() {
PageSwitcher.switchToTopNavPage(getActivity(),AddFeedFragment.class,null,getString(R.string.share),getString(R.string.commit));

}
private List<CommunityInfo> mCommunityInfoList;
private CommunityAdapter mAdapter;
Expand Down Expand Up @@ -88,8 +88,14 @@ public void loadMore() {
mRecyclerView.addItemDecoration(new SpaceItemDecoration(spacingInPixels));
mRecyclerView.setItemAnimator(null);
mPtrLayout.setLastUpdateTimeRelateObject(this);
mPtrLayout.disableWhenHorizontalMove(true);
mPtrLayout.setOnRefreshListener(new OnDefaultRefreshListener() {
// mPtrLayout.disableWhenHorizontalMove(true);
// mPtrLayout.setOnRefreshListener(new OnDefaultRefreshListener() {
// @Override
// public void onRefreshBegin(PtrFrameLayout frame) {
// requestData(0);
// }
// });
mPtrLayout.setPtrHandler(new PtrDefaultHandler() {
@Override
public void onRefreshBegin(PtrFrameLayout frame) {
requestData(0);
Expand All @@ -110,7 +116,7 @@ private void requestData(final int start) {
@Override
public void onResponse(boolean isFromCache, BaseList baseList, Request request, @Nullable Response response) {
if (start == 0) {
mPtrLayout.onRefreshComplete();
mPtrLayout.refreshComplete();
} else {
mRecyclerView.onLoadMoreComplete();
}
Expand All @@ -134,7 +140,7 @@ public void onResponse(boolean isFromCache, BaseList baseList, Request request,
public void onError(boolean isFromCache, Call call, @Nullable Response response, @Nullable Exception e) {
super.onError(isFromCache, call, response, e);
if (start == 0) {
mPtrLayout.onRefreshComplete();
mPtrLayout.refreshComplete();
} else {
mRecyclerView.onLoadMoreComplete();
}
Expand Down
21 changes: 14 additions & 7 deletions app/src/main/java/com/gjj/shop/index/IndexFragment.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
import butterknife.OnClick;
import cn.finalteam.loadingviewfinal.OnDefaultRefreshListener;
import cn.finalteam.loadingviewfinal.PtrClassicFrameLayout;
import cn.finalteam.loadingviewfinal.PtrDefaultHandler;
import cn.finalteam.loadingviewfinal.PtrFrameLayout;
import cn.finalteam.loadingviewfinal.RecyclerViewFinal;

Expand Down Expand Up @@ -122,15 +123,21 @@ public int getContentViewLayout() {
@Override
public void initView() {
mTitleTV.setText(R.string.app_name);
mPtrClassicFrameLayout.setOnRefreshListener(new OnDefaultRefreshListener() {
// mPtrClassicFrameLayout.setOnRefreshListener(new OnDefaultRefreshListener() {
// @Override
// public void onRefreshBegin(PtrFrameLayout frame) {
// runOnUiThread(new Runnable() {
// @Override
// public void run() {
// mPtrClassicFrameLayout.onRefreshComplete();
// }
// }, 200);
// }
// });
mPtrClassicFrameLayout.setPtrHandler(new PtrDefaultHandler() {
@Override
public void onRefreshBegin(PtrFrameLayout frame) {
runOnUiThread(new Runnable() {
@Override
public void run() {
mPtrClassicFrameLayout.onRefreshComplete();
}
}, 200);
mPtrClassicFrameLayout.refreshComplete();
}
});
List<String> stringList = new ArrayList<>();
Expand Down
15 changes: 11 additions & 4 deletions app/src/main/java/com/gjj/shop/index/ProductListFragment.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
import cn.finalteam.loadingviewfinal.OnDefaultRefreshListener;
import cn.finalteam.loadingviewfinal.OnLoadMoreListener;
import cn.finalteam.loadingviewfinal.PtrClassicFrameLayout;
import cn.finalteam.loadingviewfinal.PtrDefaultHandler;
import cn.finalteam.loadingviewfinal.PtrFrameLayout;
import okhttp3.Call;
import okhttp3.Request;
Expand Down Expand Up @@ -73,8 +74,14 @@ public void loadMore() {
});

mPtrLayout.setLastUpdateTimeRelateObject(this);
mPtrLayout.disableWhenHorizontalMove(true);
mPtrLayout.setOnRefreshListener(new OnDefaultRefreshListener() {
// mPtrLayout.disableWhenHorizontalMove(true);
// mPtrLayout.setOnRefreshListener(new OnDefaultRefreshListener() {
// @Override
// public void onRefreshBegin(PtrFrameLayout frame) {
// requestData(0);
// }
// });
mPtrLayout.setPtrHandler(new PtrDefaultHandler() {
@Override
public void onRefreshBegin(PtrFrameLayout frame) {
requestData(0);
Expand All @@ -95,7 +102,7 @@ private void requestData(final int start) {
@Override
public void onResponse(boolean isFromCache, BaseList baseList, Request request, @Nullable Response response) {
if (start == 0) {
mPtrLayout.onRefreshComplete();
mPtrLayout.refreshComplete();
} else {
mProductGrid.onLoadMoreComplete();
}
Expand All @@ -119,7 +126,7 @@ public void onResponse(boolean isFromCache, BaseList baseList, Request request,
public void onError(boolean isFromCache, Call call, @Nullable Response response, @Nullable Exception e) {
super.onError(isFromCache, call, response, e);
if (start == 0) {
mPtrLayout.onRefreshComplete();
mPtrLayout.refreshComplete();
} else {
mProductGrid.onLoadMoreComplete();
}
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/gjj/shop/login/RegisterFragment.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ void onGetSms() {
private void sendGetSmsReq(String account) {
//TODO 获取验证码
HashMap<String, String> params = new HashMap<>();
params.put("username", account);
params.put("phone", account);
// final JSONObject jsonObject = new JSONObject(params);
OkHttpUtils.post(ApiConstants.GET_SMS_CODE)//
.tag(this)//
Expand Down
14 changes: 7 additions & 7 deletions app/src/main/java/com/gjj/shop/main/PtrRecyclerViewFragment.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,13 +85,13 @@ public void loadMore() {
});

mPtrRvLayout.setLastUpdateTimeRelateObject(this);
mPtrRvLayout.disableWhenHorizontalMove(true);
mPtrRvLayout.setOnRefreshListener(new OnDefaultRefreshListener() {
@Override
public void onRefreshBegin(PtrFrameLayout frame) {
requestData(1);
}
});
// mPtrRvLayout.disableWhenHorizontalMove(true);
// mPtrRvLayout.setOnRefreshListener(new OnDefaultRefreshListener() {
// @Override
// public void onRefreshBegin(PtrFrameLayout frame) {
// requestData(1);
// }
// });
mPtrRvLayout.autoRefresh();
}

Expand Down
14 changes: 7 additions & 7 deletions app/src/main/java/com/gjj/shop/model/ProductInfo.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,19 +35,19 @@ public class ProductInfo implements Serializable{

public long goodsId;
public int prePrice;
// public List<String> thumbList;
// public String marks;
// public String title;
// public String type;
public List<String> thumbList;
public String marks;
public String title;
public String type;
public long createTime;
public String logoThumb;
public String name;
public String logo;
public String details;
public int curPrice;
// public int id;
// public long shopId;
// public List<String> imageList;
public int id;
public long shopId;
public List<String> imageList;
public String status;
public String shopName;
public String shopLogo;
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/gjj/shop/net/ApiConstants.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ public class ApiConstants {
public static final String host = "http://120.24.69.203:8080/";
public static final String LOGIN = host + "user/login";
public static final String REGISTER = host+ "user/register";
public static final String GET_SMS_CODE = host+ "user/getsmscode";
public static final String GET_SMS_CODE = host+ "servlet/sendPhoneCode";
public static final String CHANGE_PSW = host+ "user/updatePassword";
public static final String GET_USER_INFO = host+ "user/info";
public static final String FIND_PSW = host+ "user/findPassword";
Expand Down
22 changes: 15 additions & 7 deletions app/src/main/java/com/gjj/shop/order/OrderListFragment.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
import butterknife.ButterKnife;
import cn.finalteam.loadingviewfinal.OnDefaultRefreshListener;
import cn.finalteam.loadingviewfinal.PtrClassicFrameLayout;
import cn.finalteam.loadingviewfinal.PtrDefaultHandler;
import cn.finalteam.loadingviewfinal.PtrFrameLayout;

/**
Expand All @@ -39,15 +40,22 @@ public int getContentViewLayout() {

@Override
public void initView() {
mPtrFrame.setOnRefreshListener(new OnDefaultRefreshListener() {
// mPtrFrame.setOnRefreshListener(new OnDefaultRefreshListener() {
// @Override
// public void onRefreshBegin(PtrFrameLayout frame) {
// runOnUiThread(new Runnable() {
// @Override
// public void run() {
// mPtrFrame.onRefreshComplete();
// }
// }, 200);
// }
// });

mPtrFrame.setPtrHandler(new PtrDefaultHandler() {
@Override
public void onRefreshBegin(PtrFrameLayout frame) {
runOnUiThread(new Runnable() {
@Override
public void run() {
mPtrFrame.onRefreshComplete();
}
}, 200);
mPtrFrame.refreshComplete();
}
});
}
Expand Down
41 changes: 24 additions & 17 deletions app/src/main/java/com/gjj/shop/person/ChangePswFragment.java
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package com.gjj.shop.person;

import android.content.Intent;
import android.os.Bundle;
import android.support.annotation.Nullable;
import android.text.TextUtils;
Expand All @@ -18,7 +17,6 @@
import com.gjj.shop.R;
import com.gjj.shop.app.BaseApplication;
import com.gjj.shop.base.BaseFragment;
import com.gjj.shop.main.MainActivity;
import com.gjj.shop.model.UserInfo;
import com.gjj.shop.net.ApiConstants;
import com.lzy.okhttputils.OkHttpUtils;
Expand All @@ -37,12 +35,14 @@
* Created by Administrator on 2016/8/14.
*/
public class ChangePswFragment extends BaseFragment {
@Bind(R.id.et_sms_code)
EditText etSmsCode;


@Bind(R.id.et_old_psw)
EditText etOldPsw;
@Bind(R.id.et_new_psw)
EditText etNewPsw;
@Bind(R.id.et_new_psw_again)
EditText etNewPswAgain;
@Bind(R.id.btn_commit)
Button btnCommit;

Expand All @@ -58,28 +58,33 @@ public void initView() {

@OnClick(R.id.btn_commit)
public void onClick() {
String phone = etSmsCode.getText().toString().trim().replaceAll(" ", "");
if (TextUtils.isEmpty(phone)) {
ToastUtil.shortToast(R.string.hint_login_username);
return;
}
if (!Util.isMobileNO(phone)) {
ToastUtil.shortToast(R.string.enter_mobile_error);
return;
}
// String phone = etSmsCode.getText().toString().trim().replaceAll(" ", "");
// if (TextUtils.isEmpty(phone)) {
// ToastUtil.shortToast(R.string.hint_login_username);
// return;
// }
// if (!Util.isMobileNO(phone)) {
// ToastUtil.shortToast(R.string.enter_mobile_error);
// return;
// }
final String oldPsw = etOldPsw.getText().toString().trim().replaceAll(" ", "");
String newPsw = etNewPsw.getText().toString().trim().replaceAll(" ", "");

String newPswAgain = etNewPswAgain.getText().toString().trim().replaceAll(" ", "");
if (TextUtils.isEmpty(oldPsw) || TextUtils.isEmpty(newPsw)) {
ToastUtil.shortToast(R.string.hint_login_pwd);
return;
}

if(!newPsw.equals(newPswAgain)) {
ToastUtil.shortToast(R.string.enter_psw_error);
return;
}
HashMap<String, String> params = new HashMap<>();
params.put("username", phone);
UserInfo userInfo = BaseApplication.getUserMgr().getUser();
params.put("username", userInfo.getPhone());
params.put("password_old", MD5Util.md5Hex(oldPsw));
params.put("password_new", MD5Util.md5Hex(newPsw));
showLoadingDialog(R.string.committing,true);
showLoadingDialog(R.string.committing, true);

// final JSONObject jsonObject = new JSONObject(params);
OkHttpUtils.post(ApiConstants.CHANGE_PSW)
Expand All @@ -94,12 +99,14 @@ public void onResponse(boolean isFromCache, UserInfo rspInfo, Request request, @
ToastUtil.shortToast(R.string.commit_success);
onBackPressed();
}

@Override
public void onError(boolean isFromCache, Call call, @Nullable Response response, @Nullable Exception e) {
dismissLoadingDialog();
if(response != null)
if (response != null)
L.d("@@@@@>>", response.code());
}
});
}

}
17 changes: 17 additions & 0 deletions app/src/main/java/com/gjj/shop/person/CollectInfo.java
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
package com.gjj.shop.person;

import java.io.Serializable;

/**
* Created by Chuck on 2016/8/31.
*/
public class CollectInfo implements Serializable{
private static final long serialVersionUID = 8657677401839659329L;

public String title;
public String msg;
public String icon;
public double prePrice;
public double curPrice;
public SlideView slideView;
}
Loading

0 comments on commit 11d2cb6

Please sign in to comment.