Skip to content

android / dayu

Go to a project
Commit 045b38e1 by luofan
Options

增加商家模块，认证资质修改

parent 1edde61a
Inline Side-by-side
Showing with 496 additions and 197 deletions
app/src/main/java/com/dayu/bigfish/ui/MainActivity.java
...@@ -55,6 +55,7 @@ import com.dayu.provider.event.RefreshReceivingNum; ...@@ -55,6 +55,7 @@ import com.dayu.provider.event.RefreshReceivingNum;
import com.dayu.provider.event.SwtichFragment; import com.dayu.provider.event.SwtichFragment;
import com.dayu.provider.router.RouterPath; import com.dayu.provider.router.RouterPath;
import com.dayu.usercenter.ui.activity2.BusinessTypeActivity; import com.dayu.usercenter.ui.activity2.BusinessTypeActivity;
import com.dayu.usercenter.ui.fragment.BusinessFragment;
import com.dayu.usercenter.ui.fragment.HomeUserFragment; import com.dayu.usercenter.ui.fragment.HomeUserFragment;
import com.dayu.utils.AppUtils; import com.dayu.utils.AppUtils;
import com.dayu.utils.LogUtils; import com.dayu.utils.LogUtils;
...@@ -92,6 +93,7 @@ public class MainActivity extends BaseActivity<MainPresenter, ActivityMainBindin ...@@ -92,6 +93,7 @@ public class MainActivity extends BaseActivity<MainPresenter, ActivityMainBindin
private HomeOrderFragment secondFragment; private HomeOrderFragment secondFragment;
private HomeLearnFragment learnFragment; private HomeLearnFragment learnFragment;
private HomeUserFragment fourFragment; private HomeUserFragment fourFragment;
private BusinessFragment businessFragment;
private int mFirstPositon = 2; private int mFirstPositon = 2;
private BadgeView mBadgeView; private BadgeView mBadgeView;
private BadgeView mOrderBadgeView; private BadgeView mOrderBadgeView;
...@@ -121,8 +123,9 @@ public class MainActivity extends BaseActivity<MainPresenter, ActivityMainBindin ...@@ -121,8 +123,9 @@ public class MainActivity extends BaseActivity<MainPresenter, ActivityMainBindin
secondFragment = HomeOrderFragment.newInstance(); secondFragment = HomeOrderFragment.newInstance();
learnFragment = new HomeLearnFragment(); learnFragment = new HomeLearnFragment();
fourFragment = HomeUserFragment.newInstance(); fourFragment = HomeUserFragment.newInstance();
mFragments = new Fragment[]{saleFragment, secondFragment, learnFragment, fourFragment}; businessFragment = BusinessFragment.newInstance();
mTabs = new TextView[]{mBind.tabSale, mBind.tabSecond, mBind.tabLearn, mBind.tabFour}; mFragments = new Fragment[]{saleFragment, secondFragment, learnFragment,businessFragment, fourFragment};
mTabs = new TextView[]{mBind.tabSale, mBind.tabSecond, mBind.tabLearn,mBind.tabBusiness, mBind.tabFour};
addFragment(); addFragment();
initListener(); initListener();
doAction(getIntent()); doAction(getIntent());
...@@ -156,7 +159,7 @@ public class MainActivity extends BaseActivity<MainPresenter, ActivityMainBindin ...@@ -156,7 +159,7 @@ public class MainActivity extends BaseActivity<MainPresenter, ActivityMainBindin
}); });
mBind.tabLearn.setOnClickListener(o -> showHideFragment(2, mPosition)); mBind.tabLearn.setOnClickListener(o -> showHideFragment(2, mPosition));
mBind.tabFour.setOnClickListener(o -> { mBind.tabFour.setOnClickListener(o -> {
showHideFragment(3, mPosition); showHideFragment(4, mPosition);
showInfoDialog(); showInfoDialog();
}); });
mBind.rlInvateCode.setOnTouchListener((view, motionEvent) -> true); mBind.rlInvateCode.setOnTouchListener((view, motionEvent) -> true);
...@@ -165,6 +168,12 @@ public class MainActivity extends BaseActivity<MainPresenter, ActivityMainBindin ...@@ -165,6 +168,12 @@ public class MainActivity extends BaseActivity<MainPresenter, ActivityMainBindin
mPresenter.jumpInvateCode(); mPresenter.jumpInvateCode();
}); });
mBind.tvConfirm.setOnClickListener(v -> mPresenter.saveInvateCode()); mBind.tvConfirm.setOnClickListener(v -> mPresenter.saveInvateCode());
mBind.tabBusiness.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
showHideFragment(3, mPosition);
}
});
} }
//提示去认证身份 //提示去认证身份
......
app/src/main/res/drawable/tab_business_selector.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@mipmap/img_business_dark" android:state_selected="true"/>
<item android:drawable="@mipmap/img_business_grey"/>
</selector>
\ No newline at end of file
app/src/main/res/layout/activity_main.xml
...@@ -97,6 +97,19 @@ ...@@ -97,6 +97,19 @@
android:textColor="#585858" android:textColor="#585858"
android:textSize="10sp" /> android:textSize="10sp" />
<TextView
android:id="@+id/tab_business"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:layout_weight="1"
android:drawableTop="@drawable/tab_business_selector"
android:drawablePadding="2dp"
android:gravity="center"
android:text="@string/tab_business"
android:textColor="#585858"
android:textSize="10sp" />
<LinearLayout <LinearLayout
android:id="@+id/tab_get_order" android:id="@+id/tab_get_order"
android:layout_width="0dp" android:layout_width="0dp"
......
baseSDK/src/main/res/drawable/btn_blue_react_4.xml 0 → 100755
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners android:radius="8dp"/>
<solid android:color="@color/cl_receiving_order_item_data"/>
</shape>
\ No newline at end of file
baseSDK/src/main/res/values/strings.xml
...@@ -1043,6 +1043,10 @@ C) 在甲方使用大鱼平å°æœåŠ¡è¿‡ç¨‹ä¸­äº§ç”Ÿçš„业务数æ®ï¼Œå®¢æˆ·æ•°æ ...@@ -1043,6 +1043,10 @@ C) 在甲方使用大鱼平å°æœåŠ¡è¿‡ç¨‹ä¸­äº§ç”Ÿçš„业务数æ®ï¼Œå®¢æˆ·æ•°æ
<string name="hello_engineer">师傅您好！</string> <string name="hello_engineer">师傅您好！</string>
<string name="about_us_detial">我们是一家专注于智能硬件产品【销售-安装-运维服务】的互联网平台，公司总部位于北京中关村，国内各大城市都设有分支机构。我们基于移动互联网、云计算、大数据和人工智能技术，在帮助各种智能硬件设备厂商开展服务业务。目前大鱼服务网已覆盖全国369个城市和2800多个区县级市场，已入驻2000多家品牌厂商/系统集成商/代理服务商，注册师傅超过50000人。</string> <string name="about_us_detial">我们是一家专注于智能硬件产品【销售-安装-运维服务】的互联网平台，公司总部位于北京中关村，国内各大城市都设有分支机构。我们基于移动互联网、云计算、大数据和人工智能技术，在帮助各种智能硬件设备厂商开展服务业务。目前大鱼服务网已覆盖全国369个城市和2800多个区县级市场，已入驻2000多家品牌厂商/系统集成商/代理服务商，注册师傅超过50000人。</string>
<string name="tab_business">商家</string>
<string name="no_applay">未申请</string>
<string name="applaying">申请中</string>
<string name="certified">已认证</string>
</resources> </resources>
userCenter/src/main/debug/AndroidManifest.xml
...@@ -75,8 +75,11 @@ ...@@ -75,8 +75,11 @@
<activity <activity
android:name=".ui.activity2.BusinessTypeActivity" android:name=".ui.activity2.BusinessTypeActivity"
android:screenOrientation="portrait" /> android:screenOrientation="portrait" />
<!-- <activity-->
<!-- android:name=".ui.activity2.UserLicenceActivity"-->
<!-- android:screenOrientation="portrait" />-->
<activity <activity
android:name=".ui.activity2.UserLicenceActivity" android:name=".ui.activity2.SelfLicenceActivity"
android:screenOrientation="portrait" /> android:screenOrientation="portrait" />
<activity <activity
android:name=".ui.activity2.CommonRecordActivity" android:name=".ui.activity2.CommonRecordActivity"
......
userCenter/src/main/java/com/dayu/usercenter/adapter/SelfLicenceAdapter.java
package com.dayu.usercenter.adapter; package com.dayu.usercenter.adapter;
import android.view.View; import android.view.View;
import android.view.ViewGroup;
import android.widget.LinearLayout;
import com.dayu.base.ui.adapter.CoreAdapter; import com.dayu.base.ui.adapter.CoreAdapter;
import com.dayu.usercenter.R; import com.dayu.usercenter.R;
...@@ -22,13 +24,12 @@ public class SelfLicenceAdapter extends CoreAdapter<SelfLicenceBean, ItemUserLic ...@@ -22,13 +24,12 @@ public class SelfLicenceAdapter extends CoreAdapter<SelfLicenceBean, ItemUserLic
GlideImageLoader.load(mContext, holder.ivImg, item.getUrl(), R.drawable.icon_img_default); GlideImageLoader.load(mContext, holder.ivImg, item.getUrl(), R.drawable.icon_img_default);
holder.tvTitle.setText(item.getName()); holder.tvTitle.setText(item.getName());
holder.tvCompany.setText(getStatusDesc(item.getStatus())); holder.tvCompany.setText(getStatusDesc(item.getStatus()));
if (item.getStatus() == 3){ if (item.getStatus() == 3) {
holder.tvCompany.setTextColor(mContext.getResources().getColor(R.color.common_red)); holder.tvCompany.setTextColor(mContext.getResources().getColor(R.color.common_red));
}else { } else {
holder.tvCompany.setTextColor(mContext.getResources().getColor(R.color.color_69)); holder.tvCompany.setTextColor(mContext.getResources().getColor(R.color.color_69));
} }
holder.ivArrow.setVisibility(View.GONE); holder.ivArrow.setVisibility(View.GONE);
holder.btnApply.setVisibility(View.GONE);
} }
private String getStatusDesc(int status) { private String getStatusDesc(int status) {
......
userCenter/src/main/java/com/dayu/usercenter/adapter/UserLicenceAdapter.java
...@@ -22,9 +22,6 @@ public class UserLicenceAdapter extends CoreAdapter<UserLicenceBean,ItemUserLice ...@@ -22,9 +22,6 @@ public class UserLicenceAdapter extends CoreAdapter<UserLicenceBean,ItemUserLice
GlideImageLoader.load(mContext, holder.ivImg, item.getUrl(),R.drawable.icon_img_default); GlideImageLoader.load(mContext, holder.ivImg, item.getUrl(),R.drawable.icon_img_default);
holder.tvTitle.setText(item.getLicenceAuthorityName()); holder.tvTitle.setText(item.getLicenceAuthorityName());
holder.tvCompany.setText(item.getDetail()); holder.tvCompany.setText(item.getDetail());
holder.ivArrow.setVisibility(mPresent.type == 1?View.VISIBLE:View.GONE );
holder.btnApply.setVisibility(mPresent.type == 1?View.GONE:View.VISIBLE);
holder.btnApply.setOnClickListener(view -> mPresent.applyAllLicence(item));
} }
public void setPresent(UserLicencePresent mPresent) { public void setPresent(UserLicencePresent mPresent) {
......
userCenter/src/main/java/com/dayu/usercenter/api/UserService2.java
...@@ -147,8 +147,8 @@ public interface UserService2 { ...@@ -147,8 +147,8 @@ public interface UserService2 {
* *
* @return * @return
*/ */
@GET(Constants.API_7100 + "/licenceInfo") @GET(Constants.API_7500 + "/spData/licencePage")
Observable<BaseResponse<BasePageBean<UserLicenceBean>>> getAllLicence(@Query("status") int status, @Query("page") int page, Observable<BaseResponse<BasePageBean<UserLicenceBean>>> getAllLicence(@Query("engineerAuthStatus") int status,@Query("accountId") int accountId, @Query("page") int page,
@Query("pageSize") int pageSize); @Query("pageSize") int pageSize);
/** /**
......
userCenter/src/main/java/com/dayu/usercenter/model/bean/UserLicenceBean.java
...@@ -33,6 +33,15 @@ public class UserLicenceBean { ...@@ -33,6 +33,15 @@ public class UserLicenceBean {
private Object updateTime; private Object updateTime;
private Object updated; private Object updated;
private Object isDelete; private Object isDelete;
private String detailUrl;
public String getDetailUrl() {
return detailUrl;
}
public void setDetailUrl(String detailUrl) {
this.detailUrl = detailUrl;
}
public int getId() { public int getId() {
return id; return id;
......
userCenter/src/main/java/com/dayu/usercenter/presenter/homeuser/HomeUserPresenter.java
...@@ -12,8 +12,8 @@ import com.dayu.usercenter.ui.activity2.BusinessTypeActivity; ...@@ -12,8 +12,8 @@ import com.dayu.usercenter.ui.activity2.BusinessTypeActivity;
import com.dayu.usercenter.ui.activity2.CashRecordActivity; import com.dayu.usercenter.ui.activity2.CashRecordActivity;
import com.dayu.usercenter.ui.activity2.InvateNewActivity; import com.dayu.usercenter.ui.activity2.InvateNewActivity;
import com.dayu.usercenter.ui.activity2.InviteRecordActivity; import com.dayu.usercenter.ui.activity2.InviteRecordActivity;
import com.dayu.usercenter.ui.activity2.SelfLicenceActivity;
import com.dayu.usercenter.ui.activity2.UserInfoActivity; import com.dayu.usercenter.ui.activity2.UserInfoActivity;
import com.dayu.usercenter.ui.activity2.UserLicenceActivity;
import com.dayu.utils.CommonUtils; import com.dayu.utils.CommonUtils;
/** /**
...@@ -102,7 +102,7 @@ public class HomeUserPresenter extends HomeUserContract.Presenter { ...@@ -102,7 +102,7 @@ public class HomeUserPresenter extends HomeUserContract.Presenter {
@Override @Override
public void dumpToLicence() { public void dumpToLicence() {
mView.startActivity(UserLicenceActivity.class); mView.startActivity(SelfLicenceActivity.class);
} }
@Override @Override
......
userCenter/src/main/java/com/dayu/usercenter/presenter/userlicence/UserLicencePresent.java
...@@ -12,7 +12,7 @@ import com.dayu.utils.SPUtils; ...@@ -12,7 +12,7 @@ import com.dayu.utils.SPUtils;
import com.dayu.utils.ToastUtils; import com.dayu.utils.ToastUtils;
import com.dayu.utils.UserManager; import com.dayu.utils.UserManager;
public class UserLicencePresent extends UserLicenceContract.Presenter{ public class UserLicencePresent extends UserLicenceContract.Presenter {
private int mPage; private int mPage;
private int mUserId; private int mUserId;
private String mUserName; private String mUserName;
...@@ -37,17 +37,21 @@ public class UserLicencePresent extends UserLicenceContract.Presenter{ ...@@ -37,17 +37,21 @@ public class UserLicencePresent extends UserLicenceContract.Presenter{
@Override @Override
public void refresh() { public void refresh() {
switch (type){ switch (type) {
case 1: case 1:
getHasedLicence(); mPage = 1;
getAllLicence(2);
break; break;
case 2: case 2:
mPage = 1; mPage = 1;
getAllLicence(); getAllLicence(3);
break; break;
case 3: case 3:
mPage = 1; mPage = 1;
getAllLicence(1);
break;
case 4:
mPage = 1;
getSelfLicence(); getSelfLicence();
break; break;
} }
...@@ -55,55 +59,38 @@ public class UserLicencePresent extends UserLicenceContract.Presenter{ ...@@ -55,55 +59,38 @@ public class UserLicencePresent extends UserLicenceContract.Presenter{
@Override @Override
public void loadMore() { public void loadMore() {
switch (type){ switch (type) {
case 1: case 1:
getHasedLicence(); getAllLicence(2);
break; break;
case 2: case 2:
getAllLicence(); getAllLicence(3);
break; break;
case 3: case 3:
getAllLicence(1);
break;
case 4:
mPage = 1;
getSelfLicence(); getSelfLicence();
break; break;
} }
} }
//已获认证
private void getHasedLicence() {
Api.getService(UserService2.class).gethasedLicence(mUserId).compose(Api.applySchedulers())
.subscribe(baseObserver(licences->{
datas.set(licences);
},responeThrowable -> datas.set(Constants.FAILED)));
}
//全部认证 //全部认证
private void getAllLicence() { private void getAllLicence(int status) {
Api.getService(UserService2.class).getAllLicence(1,mPage,Constants.PAGESIZE).compose(Api.applySchedulers()) Api.getService(UserService2.class).getAllLicence(status, mUserId, mPage, Constants.PAGESIZE).compose(Api.applySchedulers())
.subscribe(baseObserver(licences->{ .subscribe(baseObserver(licences -> {
datas.set(licences); datas.set(licences);
mPage++; mPage++;
},responeThrowable -> datas.set(Constants.FAILED))); }, responeThrowable -> datas.set(Constants.FAILED)));
} }
//全部认证
private void getSelfLicence() { private void getSelfLicence() {
Api.getService(UserService2.class).getSelfLicence(mUserId,mPage,Constants.PAGESIZE).compose(Api.applySchedulers()) Api.getService(UserService2.class).getSelfLicence(mUserId, mPage, Constants.PAGESIZE).compose(Api.applySchedulers())
.subscribe(baseObserver(licences->{ .subscribe(baseObserver(licences -> {
datas.set(licences); datas.set(licences);
mPage++; mPage++;
},responeThrowable -> datas.set(Constants.FAILED))); }, responeThrowable -> datas.set(Constants.FAILED)));
}
//申请认证
public void applyAllLicence(UserLicenceBean item) {
mView.showDialog();
ApplyLicenceData applyData = new ApplyLicenceData(mUserId,item.getId(),
item.getLicenceAuthorityId(),item.getLicenceAuthorityName(),3);
applyData.accountName = mUserName;
applyData.accountMobile = (String) SPUtils.get("USER_PHONE","");
Api.getService(UserService2.class).applyLicence(applyData).compose(Api.applySchedulers())
.subscribe(baseObserver(result->{
ToastUtils.showShortToast(result?"申请成功":"申请失败");
}));
} }
} }
userCenter/src/main/java/com/dayu/usercenter/ui/activity/CommeWebViewActivity.java
...@@ -5,6 +5,7 @@ import android.content.Intent; ...@@ -5,6 +5,7 @@ import android.content.Intent;
import android.net.Uri; import android.net.Uri;
import android.os.Build; import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
import android.text.TextUtils;
import android.view.KeyEvent; import android.view.KeyEvent;
import android.view.View; import android.view.View;
import android.webkit.ValueCallback; import android.webkit.ValueCallback;
...@@ -46,7 +47,13 @@ public class CommeWebViewActivity extends DataBindingActivity<ActivityWebviewBin ...@@ -46,7 +47,13 @@ public class CommeWebViewActivity extends DataBindingActivity<ActivityWebviewBin
public void initView() { public void initView() {
Bundle bundle = getIntent().getBundleExtra(Constants.BUNDLE); Bundle bundle = getIntent().getBundleExtra(Constants.BUNDLE);
mUrl = bundle.getString(Constants.URL); mUrl = bundle.getString(Constants.URL);
String title = bundle.getString(Constants.TITLE);
if(TextUtils.isEmpty(title)){
mBind.rlTitle.setVisibility(View.GONE); mBind.rlTitle.setVisibility(View.GONE);
}else {
mBind.tvTitle.setText(title);
mBind.titleBack.setOnClickListener(v -> finish());
}
mWebView = new BridgeWebView(mActivity); mWebView = new BridgeWebView(mActivity);
mWebView.setLayoutParams(new LinearLayout.LayoutParams( mWebView.setLayoutParams(new LinearLayout.LayoutParams(
LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.MATCH_PARENT)); LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.MATCH_PARENT));
......
userCenter/src/main/java/com/dayu/usercenter/ui/activity2/SelfLicenceActivity.java 0 → 100644
package com.dayu.usercenter.ui.activity2;
import android.content.Intent;
import android.os.Bundle;
import android.support.annotation.Nullable;
import com.dayu.base.ui.activity.BaseActivity;
import com.dayu.base.ui.fragment.BaseFragment;
import com.dayu.common.Constants;
import com.dayu.usercenter.R;
import com.dayu.usercenter.adapter.SelfLicenceAdapter;
import com.dayu.usercenter.databinding.ActivityUserLicenceListBinding;
import com.dayu.usercenter.databinding.FragmentUserLicenceBinding;
import com.dayu.usercenter.event.UploadSelfLicenceEvent;
import com.dayu.usercenter.presenter.userlicence.UserLicenceContract;
import com.dayu.usercenter.presenter.userlicence.UserLicencePresent;
import org.greenrobot.eventbus.EventBus;
import org.greenrobot.eventbus.Subscribe;
import org.greenrobot.eventbus.ThreadMode;
/**
* Created by mReturn
* on 2020/2/15
**/
public class SelfLicenceActivity extends BaseActivity<UserLicencePresent, ActivityUserLicenceListBinding>
implements UserLicenceContract.View {
private SelfLicenceAdapter mAdapter;
@Override
public int getLayoutId() {
return R.layout.activity_user_licence_list;
}
@Override
public void setPresenter() {
mBind.setPresenter(mPresenter);
}
@Override
public void initView() {
mPresenter.setType(4);
mBind.upload.setOnClickListener(v -> startActivity(UploadSelfLicenceActivity.class));
mBind.titleBack.setOnClickListener(v -> finish());
mAdapter = new SelfLicenceAdapter(true);
mAdapter.setViewType(R.layout.item_user_licence);
mAdapter.setPresent(mPresenter);
mBind.recyclerView.setAdapter(mAdapter);
mAdapter.setOnItemClickListener((item, bind) -> {
if (item.getStatus() == 3) {
Intent intent = new Intent(mActivity, UploadSelfLicenceActivity.class);
intent.putExtra(Constants.ID, item.getId());
intent.putExtra(Constants.TITLE, item.getName());
intent.putExtra(Constants.URL, item.getUrl());
startActivity(intent);
}
});
showDialog();
mPresenter.refresh();
}
@Subscribe(threadMode = ThreadMode.MAIN)
public void afterUpload(UploadSelfLicenceEvent event) {
mPresenter.refresh();
}
}
userCenter/src/main/java/com/dayu/usercenter/ui/activity2/UserLicenceActivity.java
package com.dayu.usercenter.ui.activity2; //package com.dayu.usercenter.ui.activity2;
//
import android.support.v4.app.Fragment; //import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentManager; //import android.support.v4.app.FragmentManager;
import android.support.v4.app.FragmentTransaction; //import android.support.v4.app.FragmentTransaction;
import android.view.View; //import android.view.View;
//
import com.dayu.base.ui.activity.BaseActivity; //import com.dayu.base.ui.activity.BaseActivity;
import com.dayu.base.ui.presenter.SImplePresenter; //import com.dayu.base.ui.presenter.SImplePresenter;
import com.dayu.usercenter.R; //import com.dayu.usercenter.R;
import com.dayu.usercenter.databinding.ActivityUserLicenceBinding; //import com.dayu.usercenter.databinding.ActivityUserLicenceBinding;
import com.dayu.usercenter.ui.fragment.SelfLicenceFragment; //import com.dayu.usercenter.ui.fragment.SelfLicenceFragment;
import com.dayu.usercenter.ui.fragment.UserLicenceFragment; //import com.dayu.usercenter.ui.fragment.UserLicenceFragment;
import com.umeng.analytics.MobclickAgent; //import com.umeng.analytics.MobclickAgent;
//
import java.util.ArrayList; //import java.util.ArrayList;
//
//
/** ///**
* Created by mReturn // * Created by mReturn
**/ // **/
public class UserLicenceActivity extends BaseActivity<SImplePresenter, ActivityUserLicenceBinding> { //public class UserLicenceActivity extends BaseActivity<SImplePresenter, ActivityUserLicenceBinding> {
//
private FragmentManager mFragmentManger; // private FragmentManager mFragmentManger;
private ArrayList<Fragment> mFragments = new ArrayList<>(); // private ArrayList<Fragment> mFragments = new ArrayList<>();
private int mPosition; // private int mPosition;
//
@Override // @Override
public void setPresenter() { // public void setPresenter() {
//
} // }
//
@Override // @Override
public int getLayoutId() { // public int getLayoutId() {
return R.layout.activity_user_licence; // return R.layout.activity_user_licence;
} // }
//
@Override // @Override
public void initView() { // public void initView() {
MobclickAgent.onEvent(mActivity, "look_certification"); // MobclickAgent.onEvent(mActivity, "look_certification");
mBind.receivingBack.setOnClickListener(v -> dumpBack()); //// mBind.receivingBack.setOnClickListener(v -> dumpBack());
//
mBind.ivAdd.setOnClickListener(v->startActivity(UploadSelfLicenceActivity.class)); // mBind.ivAdd.setOnClickListener(v->startActivity(UploadSelfLicenceActivity.class));
//
mFragments.add(UserLicenceFragment.newInstance(2)); // mFragments.add(UserLicenceFragment.newInstance(2));
mFragments.add(UserLicenceFragment.newInstance(1)); // mFragments.add(UserLicenceFragment.newInstance(1));
mFragments.add(new SelfLicenceFragment()); // mFragments.add(new SelfLicenceFragment());
//
initBtn(); // initBtn();
addFragment(); // addFragment();
} // }
//
//初始化tab // //初始化tab
public void initBtn() { // public void initBtn() {
mBind.btnAll.setSelected(true); // mBind.btnAll.setSelected(true);
mBind.btnAll.setTextColor(getResources().getColor(R.color.white)); // mBind.btnAll.setTextColor(getResources().getColor(R.color.white));
mBind.btnHave.setOnClickListener((view) -> { // mBind.btnHave.setOnClickListener((view) -> {
reSelected(); // reSelected();
mBind.btnHave.setSelected(true); // mBind.btnHave.setSelected(true);
mBind.btnHave.setTextColor(getResources().getColor(R.color.white)); // mBind.btnHave.setTextColor(getResources().getColor(R.color.white));
showHideFragment(1, mPosition); // showHideFragment(1, mPosition);
}); // });
mBind.btnAll.setOnClickListener((view) -> { // mBind.btnAll.setOnClickListener((view) -> {
reSelected(); // reSelected();
mBind.btnAll.setSelected(true); // mBind.btnAll.setSelected(true);
mBind.btnAll.setTextColor(getResources().getColor(R.color.white)); // mBind.btnAll.setTextColor(getResources().getColor(R.color.white));
showHideFragment(0, mPosition); // showHideFragment(0, mPosition);
}); // });
mBind.btnSelf.setOnClickListener((view) -> { // mBind.btnSelf.setOnClickListener((view) -> {
reSelected(); // reSelected();
mBind.btnSelf.setSelected(true); // mBind.btnSelf.setSelected(true);
mBind.btnSelf.setTextColor(getResources().getColor(R.color.white)); // mBind.btnSelf.setTextColor(getResources().getColor(R.color.white));
showHideFragment(2, mPosition); // showHideFragment(2, mPosition);
}); // });
} // }
//
public void addFragment() { // public void addFragment() {
mFragmentManger = getSupportFragmentManager(); // mFragmentManger = getSupportFragmentManager();
FragmentTransaction transaction = mFragmentManger.beginTransaction() // FragmentTransaction transaction = mFragmentManger.beginTransaction()
.setTransition(FragmentTransaction.TRANSIT_FRAGMENT_OPEN); // .setTransition(FragmentTransaction.TRANSIT_FRAGMENT_OPEN);
for (int i = 0; i < mFragments.size(); i++) { // for (int i = 0; i < mFragments.size(); i++) {
Fragment fragment = mFragments.get(i); // Fragment fragment = mFragments.get(i);
transaction.add(R.id.fl_container, fragment); // transaction.add(R.id.fl_container, fragment);
transaction.hide(fragment); // transaction.hide(fragment);
} // }
mPosition = 0; // mPosition = 0;
transaction.show(mFragments.get(mPosition)); // transaction.show(mFragments.get(mPosition));
transaction.commit(); // transaction.commit();
} // }
//
//充值 // //充值
private void reSelected() { // private void reSelected() {
mBind.btnHave.setSelected(false); // mBind.btnHave.setSelected(false);
mBind.btnAll.setSelected(false); // mBind.btnAll.setSelected(false);
mBind.btnSelf.setSelected(false); // mBind.btnSelf.setSelected(false);
mBind.btnHave.setTextColor(getResources().getColor(R.color.cl_home_button)); // mBind.btnHave.setTextColor(getResources().getColor(R.color.cl_home_button));
mBind.btnAll.setTextColor(getResources().getColor(R.color.cl_home_button)); // mBind.btnAll.setTextColor(getResources().getColor(R.color.cl_home_button));
mBind.btnSelf.setTextColor(getResources().getColor(R.color.cl_home_button)); // mBind.btnSelf.setTextColor(getResources().getColor(R.color.cl_home_button));
} // }
//
//切换页面 // //切换页面
private void showHideFragment(int showPosition, int hidePosition) { // private void showHideFragment(int showPosition, int hidePosition) {
if (showPosition == hidePosition) return; // if (showPosition == hidePosition) return;
mBind.ivAdd.setVisibility(showPosition == 2 ? View.VISIBLE : View.GONE); // mBind.ivAdd.setVisibility(showPosition == 2 ? View.VISIBLE : View.GONE);
mFragmentManger.beginTransaction() // mFragmentManger.beginTransaction()
.show(mFragments.get(showPosition)) // .show(mFragments.get(showPosition))
.hide(mFragments.get(hidePosition)) // .hide(mFragments.get(hidePosition))
.commit(); // .commit();
mPosition = showPosition; // mPosition = showPosition;
} // }
} //}
userCenter/src/main/java/com/dayu/usercenter/ui/fragment/BusinessFragment.java 0 → 100644
package com.dayu.usercenter.ui.fragment;
import android.os.Bundle;
import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentManager;
import android.support.v4.app.FragmentTransaction;
import android.view.View;
import com.dayu.base.ui.activity.BaseActivity;
import com.dayu.base.ui.fragment.BaseFragment;
import com.dayu.base.ui.presenter.SImplePresenter;
import com.dayu.usercenter.R;
import com.dayu.usercenter.databinding.ActivityUserLicenceBinding;
import com.dayu.usercenter.ui.activity2.UploadSelfLicenceActivity;
import com.umeng.analytics.MobclickAgent;
import java.util.ArrayList;
/**
* Created by mReturn
**/
public class BusinessFragment extends BaseFragment<SImplePresenter, ActivityUserLicenceBinding> {
private FragmentManager mFragmentManger;
private ArrayList<Fragment> mFragments = new ArrayList<>();
private int mPosition;
public static BusinessFragment newInstance() {
Bundle args = new Bundle();
BusinessFragment fragment = new BusinessFragment();
fragment.setArguments(args);
return fragment;
}
@Override
public void setPresenter() {
}
@Override
public int getLayoutId() {
return R.layout.activity_user_licence;
}
@Override
public void initView() {
MobclickAgent.onEvent(mActivity, "look_certification");
mFragments.add(UserLicenceFragment.newInstance(1));
mFragments.add(UserLicenceFragment.newInstance(2));
mFragments.add(UserLicenceFragment.newInstance(3));
initBtn();
addFragment();
}
//初始化tab
public void initBtn() {
mBind.btnAll.setSelected(true);
mBind.btnAll.setTextColor(getResources().getColor(R.color.white));
mBind.btnHave.setOnClickListener((view) -> {
reSelected();
mBind.btnHave.setSelected(true);
mBind.btnHave.setTextColor(getResources().getColor(R.color.white));
showHideFragment(2, mPosition);
});
mBind.btnAll.setOnClickListener((view) -> {
reSelected();
mBind.btnAll.setSelected(true);
mBind.btnAll.setTextColor(getResources().getColor(R.color.white));
showHideFragment(0, mPosition);
});
mBind.applying.setOnClickListener((view) -> {
reSelected();
mBind.applying.setSelected(true);
mBind.applying.setTextColor(getResources().getColor(R.color.white));
showHideFragment(1, mPosition);
});
}
public void addFragment() {
mFragmentManger = getChildFragmentManager();
FragmentTransaction transaction = mFragmentManger.beginTransaction()
.setTransition(FragmentTransaction.TRANSIT_FRAGMENT_OPEN);
for (int i = 0; i < mFragments.size(); i++) {
Fragment fragment = mFragments.get(i);
transaction.add(R.id.fl_container, fragment);
transaction.hide(fragment);
}
mPosition = 0;
transaction.show(mFragments.get(mPosition));
transaction.commit();
}
//充值
private void reSelected() {
mBind.btnHave.setSelected(false);
mBind.btnAll.setSelected(false);
mBind.applying.setSelected(false);
mBind.btnHave.setTextColor(getResources().getColor(R.color.cl_home_button));
mBind.btnAll.setTextColor(getResources().getColor(R.color.cl_home_button));
mBind.applying.setTextColor(getResources().getColor(R.color.cl_home_button));
}
//切换页面
private void showHideFragment(int showPosition, int hidePosition) {
if (showPosition == hidePosition) return;
mFragmentManger.beginTransaction()
.show(mFragments.get(showPosition))
.hide(mFragments.get(hidePosition))
.commit();
mPosition = showPosition;
}
}
userCenter/src/main/java/com/dayu/usercenter/ui/fragment/UserLicenceFragment.java
package com.dayu.usercenter.ui.fragment; package com.dayu.usercenter.ui.fragment;
import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
import com.dayu.base.ui.fragment.BaseFragment; import com.dayu.base.ui.fragment.BaseFragment;
...@@ -9,6 +10,7 @@ import com.dayu.usercenter.adapter.UserLicenceAdapter; ...@@ -9,6 +10,7 @@ import com.dayu.usercenter.adapter.UserLicenceAdapter;
import com.dayu.usercenter.databinding.FragmentUserLicenceBinding; import com.dayu.usercenter.databinding.FragmentUserLicenceBinding;
import com.dayu.usercenter.presenter.userlicence.UserLicenceContract; import com.dayu.usercenter.presenter.userlicence.UserLicenceContract;
import com.dayu.usercenter.presenter.userlicence.UserLicencePresent; import com.dayu.usercenter.presenter.userlicence.UserLicencePresent;
import com.dayu.usercenter.ui.activity.CommeWebViewActivity;
import com.dayu.usercenter.ui.activity.LicenceDetailActivity; import com.dayu.usercenter.ui.activity.LicenceDetailActivity;
/** /**
...@@ -44,20 +46,19 @@ public class UserLicenceFragment extends BaseFragment<UserLicencePresent, Fragme ...@@ -44,20 +46,19 @@ public class UserLicenceFragment extends BaseFragment<UserLicencePresent, Fragme
Bundle bundle = getArguments(); Bundle bundle = getArguments();
type = bundle.getInt("type"); type = bundle.getInt("type");
mPresenter.setType(type); mPresenter.setType(type);
mAdapter = new UserLicenceAdapter(type != 1); mAdapter = new UserLicenceAdapter(type != 1);
mAdapter.setViewType(R.layout.item_user_licence); mAdapter.setViewType(R.layout.item_user_licence);
mAdapter.setPresent(mPresenter); mAdapter.setPresent(mPresenter);
mBind.recyclerView.setAdapter(mAdapter); mBind.recyclerView.setAdapter(mAdapter);
// if (type == 1){
mAdapter.setOnItemClickListener((item, bind) -> { mAdapter.setOnItemClickListener((item, bind) -> {
Bundle bundleDetail = new Bundle(); initUser();
bundleDetail.putInt(Constants.ID, item.getId()); Bundle bundle1 = new Bundle();
startActivity(LicenceDetailActivity.class, bundleDetail); bundle1.putString(Constants.URL, item.getDetailUrl() + "&accountId=" + mUserId);
bundle1.putString(Constants.TITLE, "商家详情");
Intent intent = new Intent(mActivity, CommeWebViewActivity.class);
intent.putExtra(Constants.BUNDLE, bundle1);
startActivity(intent);
}); });
// }
showDialog(); showDialog();
mPresenter.refresh(); mPresenter.refresh();
......
userCenter/src/main/release/AndroidManifest.xml
...@@ -78,8 +78,11 @@ ...@@ -78,8 +78,11 @@
<activity <activity
android:name=".ui.activity2.BusinessTypeActivity" android:name=".ui.activity2.BusinessTypeActivity"
android:screenOrientation="portrait" /> android:screenOrientation="portrait" />
<!-- <activity-->
<!-- android:name=".ui.activity2.UserLicenceActivity"-->
<!-- android:screenOrientation="portrait" />-->
<activity <activity
android:name=".ui.activity2.UserLicenceActivity" android:name=".ui.activity2.SelfLicenceActivity"
android:screenOrientation="portrait" /> android:screenOrientation="portrait" />
<activity <activity
android:name=".ui.activity2.CommonRecordActivity" android:name=".ui.activity2.CommonRecordActivity"
......
userCenter/src/main/res/layout/activity_user_licence.xml
...@@ -13,14 +13,10 @@ ...@@ -13,14 +13,10 @@
<TextView <TextView
android:id="@+id/tv_title" android:id="@+id/tv_title"
style="@style/text_title" style="@style/text_title"
android:text="@string/tv_person_center_licence" android:text="@string/tab_business"
/> />
<ImageView <ImageView
android:id="@+id/receiving_back"
style="@style/title_image_back"
/>
<ImageView
android:visibility="gone" android:visibility="gone"
android:id="@+id/iv_add" android:id="@+id/iv_add"
style="@style/title_image_back" style="@style/title_image_back"
...@@ -48,24 +44,25 @@ ...@@ -48,24 +44,25 @@
android:layout_weight="1" android:layout_weight="1"
android:background="@drawable/detail_center_selector" android:background="@drawable/detail_center_selector"
android:gravity="center" android:gravity="center"
android:text="@string/licence_all" /> android:text="@string/no_applay" />
<Button <Button
android:id="@+id/btn_have" android:id="@+id/applying"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="35dp" android:layout_height="35dp"
android:layout_weight="1"
android:background="@drawable/detail_center_selector" android:background="@drawable/detail_center_selector"
android:gravity="center" android:gravity="center"
android:text="@string/licence_haved" /> android:text="@string/applaying" />
<Button <Button
android:id="@+id/btn_self" android:id="@+id/btn_have"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="35dp"
android:layout_weight="1" android:layout_weight="1"
android:background="@drawable/detail_end_selector" android:layout_height="35dp"
android:background="@drawable/detail_center_selector"
android:gravity="center" android:gravity="center"
android:text="@string/licence_self" /> android:text="@string/certified" />
</LinearLayout> </LinearLayout>
<FrameLayout <FrameLayout
......
userCenter/src/main/res/layout/activity_user_licence_list.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<layout xmlns:android="http://schemas.android.com/apk/res/android">
<data>
<variable
name="presenter"
type="com.dayu.usercenter.presenter.userlicence.UserLicencePresent" />
</data>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<RelativeLayout
android:id="@+id/rl_title"
style="@style/title">
<TextView
android:id="@+id/tv_title"
style="@style/text_title"
android:text="资质证书" />
<ImageView
android:id="@+id/title_back"
style="@style/title_image_back" />
</RelativeLayout>
<ImageView style="@style/card_line" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_50"
android:gravity="center_vertical"
android:orientation="horizontal">
<TextView
android:id="@+id/upload"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_10"
android:background="@drawable/btn_blue_react_4"
android:padding="10dp"
android:text="+上传资质证书"
android:textColor="@color/white" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingStart="@dimen/dp_10"
android:paddingEnd="@dimen/dp_10"
android:text="证明自己的技术实力，获得更多商家关注!" />
</LinearLayout>
<android.support.v7.widget.RecyclerView
android:id="@+id/rv_licence"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="15dp"
android:overScrollMode="never"
android:visibility="gone" />
<com.dayu.widgets.LRecyclerView
android:id="@+id/recyclerView"
setPresenter="@{presenter}"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#f5f5f5" />
</LinearLayout>
</layout>
\ No newline at end of file
userCenter/src/main/res/layout/item_user_licence.xml
...@@ -15,15 +15,16 @@ ...@@ -15,15 +15,16 @@
<ImageView <ImageView
android:id="@+id/iv_img" android:id="@+id/iv_img"
android:layout_width="45dp" android:layout_width="120dp"
android:layout_height="45dp" android:layout_height="120dp"
android:scaleType="centerCrop"
android:src="@drawable/icon_img_default" /> android:src="@drawable/icon_img_default" />
<LinearLayout <LinearLayout
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_15" android:layout_marginLeft="@dimen/dp_15"
android:layout_weight="1" android:layout_weight="2"
android:orientation="vertical"> android:orientation="vertical">
...@@ -51,16 +52,6 @@ ...@@ -51,16 +52,6 @@
android:layout_height="15dp" android:layout_height="15dp"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:src="@drawable/icon_arrow_right" /> android:src="@drawable/icon_arrow_right" />
<Button
android:id="@+id/btn_apply"
android:layout_width="60dp"
android:layout_height="30dp"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:background="@color/cl_home_button"
android:text="@string/licence_apply_str"
android:textColor="@color/white" />
</RelativeLayout> </RelativeLayout>
</LinearLayout> </LinearLayout>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment