Skip to content

android / dayu

Go to a project
Commit d760c979 by mReturn
Options

注册登录功能改版&修改图标

parent a21f42ca
Expand all
Inline Side-by-side
Showing with 604 additions and 279 deletions
app/src/main/java/com/dayu/bigfish/api/APIService.java
...@@ -80,5 +80,12 @@ public interface APIService { ...@@ -80,5 +80,12 @@ public interface APIService {
@POST(Constants.API_7400+"/umMessage/umengAccount") @POST(Constants.API_7400+"/umMessage/umengAccount")
Observable<BaseResponse<Boolean>> bindUmeng(@Body BindUmengData data); Observable<BaseResponse<Boolean>> bindUmeng(@Body BindUmengData data);
/**
* 设置邀请码
*/
@GET(Constants.API_7100+"/inviters/inviterEngineer")
Observable<BaseResponse<Boolean>> setInvateCode(@Query("engineerId") int engineerId,
@Query("inviterCode") String inviterCode);
} }
app/src/main/java/com/dayu/bigfish/presenter/main/MainContract.java
...@@ -29,6 +29,15 @@ public interface MainContract { ...@@ -29,6 +29,15 @@ public interface MainContract {
* 跳转到服务场景设置页面 * 跳转到服务场景设置页面
*/ */
void toServiceSence(); void toServiceSence();
/**
* 显示邀请码框
*/
void showInvateCodeView();
/**
* 隐藏邀请码框
*/
void hideInvateCodeView();
} }
abstract class Presenter extends BasePresenter<View> { abstract class Presenter extends BasePresenter<View> {
......
app/src/main/java/com/dayu/bigfish/presenter/main/MainPresenter.java
package com.dayu.bigfish.presenter.main; package com.dayu.bigfish.presenter.main;
import android.databinding.ObservableField; import android.databinding.ObservableField;
import android.text.TextUtils;
import com.dayu.base.api.Api; import com.dayu.base.api.Api;
import com.dayu.bigfish.MyApplication; import com.dayu.bigfish.MyApplication;
import com.dayu.bigfish.api.APIService;
import com.dayu.bigfish.api.ApiFactory; import com.dayu.bigfish.api.ApiFactory;
import com.dayu.common.Constants; import com.dayu.common.Constants;
import com.dayu.event.UserInfo; import com.dayu.event.UserInfo;
...@@ -12,6 +14,7 @@ import com.dayu.usercenter.api.UserApiFactory; ...@@ -12,6 +14,7 @@ import com.dayu.usercenter.api.UserApiFactory;
import com.dayu.usercenter.api.UserService2; import com.dayu.usercenter.api.UserService2;
import com.dayu.utils.AppUtils; import com.dayu.utils.AppUtils;
import com.dayu.utils.SPUtils; import com.dayu.utils.SPUtils;
import com.dayu.utils.ToastUtils;
import com.dayu.utils.UserManager; import com.dayu.utils.UserManager;
import org.json.JSONException; import org.json.JSONException;
...@@ -29,6 +32,7 @@ public class MainPresenter extends MainContract.Presenter { ...@@ -29,6 +32,7 @@ public class MainPresenter extends MainContract.Presenter {
* 待接单数目. * 待接单数目.
*/ */
public ObservableField<String> tabRecive = new ObservableField<>("0"); public ObservableField<String> tabRecive = new ObservableField<>("0");
public ObservableField<String> invateCode = new ObservableField<>();
private UserInfo mUser; private UserInfo mUser;
private int mAccountId; private int mAccountId;
private int mSiteId; private int mSiteId;
...@@ -38,6 +42,10 @@ public class MainPresenter extends MainContract.Presenter { ...@@ -38,6 +42,10 @@ public class MainPresenter extends MainContract.Presenter {
mUser = UserManager.getInstance().getUser(); mUser = UserManager.getInstance().getUser();
mAccountId = Integer.parseInt(mUser.getAccountId()); mAccountId = Integer.parseInt(mUser.getAccountId());
mSiteId = mUser.getSiteId(); mSiteId = mUser.getSiteId();
if (!TextUtils.isEmpty(mUser.getNewAccount())){
mView.showInvateCodeView();
}
request(); request();
} }
...@@ -148,4 +156,27 @@ public class MainPresenter extends MainContract.Presenter { ...@@ -148,4 +156,27 @@ public class MainPresenter extends MainContract.Presenter {
})); }));
} }
//设置验证码
public void saveInvateCode() {
if (invateCode.get() == null || TextUtils.isEmpty(invateCode.get())){
mView.showToast("请填写邀请码");
}else {
mView.showDialog();
Api.getService(APIService.class).setInvateCode(mAccountId,invateCode.get()).compose(Api.applySchedulers())
.subscribe(baseObserver(success->{
if (success){
mView.hideInvateCodeView();
}
ToastUtils.showShortToast(success?"设置成功":"设置失败");
}));
}
}
//跳过验证码
public void jumpInvateCode() {
Api.getService(APIService.class).setInvateCode(mAccountId,"").compose(Api.applySchedulers())
.subscribe(baseObserver(success->{
}));
}
} }
app/src/main/java/com/dayu/bigfish/presenter/setting/SettingPresenter.java
...@@ -183,16 +183,4 @@ public class SettingPresenter extends SettingContract.Presenter { ...@@ -183,16 +183,4 @@ public class SettingPresenter extends SettingContract.Presenter {
MobclickAgent.onEvent(MyApplication.getContext(), "feed_back"); MobclickAgent.onEvent(MyApplication.getContext(), "feed_back");
} }
public void toDev(){
AppUtils.changeToDevEnv();
AppUtils.exitApp();
}
public void toUat(){
AppUtils.changeToUatEnv();
AppUtils.exitApp();
}
public void toRelease(){
AppUtils.changeToReleaseEnv();
AppUtils.exitApp();
}
} }
app/src/main/java/com/dayu/bigfish/ui/AboutUsActivity.java
...@@ -3,6 +3,7 @@ package com.dayu.bigfish.ui; ...@@ -3,6 +3,7 @@ package com.dayu.bigfish.ui;
import com.dayu.base.ui.activity.DataBindingActivity; import com.dayu.base.ui.activity.DataBindingActivity;
import com.dayu.bigfish.AboutUsBinding; import com.dayu.bigfish.AboutUsBinding;
import com.dayu.bigfish.R; import com.dayu.bigfish.R;
import com.dayu.common.Constants;
import com.dayu.utils.AppUtils; import com.dayu.utils.AppUtils;
/** /**
...@@ -21,6 +22,11 @@ public class AboutUsActivity extends DataBindingActivity<AboutUsBinding> { ...@@ -21,6 +22,11 @@ public class AboutUsActivity extends DataBindingActivity<AboutUsBinding> {
public void initView() { public void initView() {
mBind.ivBack.setOnClickListener(o -> finish()); mBind.ivBack.setOnClickListener(o -> finish());
String versionCode = AppUtils.getPackageNum(); String versionCode = AppUtils.getPackageNum();
if (Constants.ENVIROMENT.equals("debug")) {
versionCode = (String.format(getString(com.dayu.usercenter.R.string.enviroment_debug), versionCode));
} else if (Constants.ENVIROMENT.equals("uat")) {
versionCode = (String.format(getString(com.dayu.usercenter.R.string.enviroment_uat), versionCode));
}
mBind.tvVersion.setText(getString(R.string.tv_now_version)+versionCode); mBind.tvVersion.setText(getString(R.string.tv_now_version)+versionCode);
} }
......
app/src/main/java/com/dayu/bigfish/ui/MainActivity.java
...@@ -15,6 +15,8 @@ import android.support.v4.content.FileProvider; ...@@ -15,6 +15,8 @@ import android.support.v4.content.FileProvider;
import android.text.TextUtils; import android.text.TextUtils;
import android.view.Gravity; import android.view.Gravity;
import android.view.KeyEvent; import android.view.KeyEvent;
import android.view.MotionEvent;
import android.view.View;
import android.widget.TextView; import android.widget.TextView;
import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.facade.annotation.Route;
...@@ -85,13 +87,9 @@ public class MainActivity extends BaseActivity<MainPresenter, ActivityMainBindin ...@@ -85,13 +87,9 @@ public class MainActivity extends BaseActivity<MainPresenter, ActivityMainBindin
private TextView[] mTabs; private TextView[] mTabs;
private NotificationManager notificationManager; private NotificationManager notificationManager;
private NotificationCompat.Builder builder; private NotificationCompat.Builder builder;
// private ManagerFragment managerFragment;
// private HomeFirstTabFragment firstFragment;
private HomeSaleFragment saleFragment; private HomeSaleFragment saleFragment;
private HomeOrderFragment secondFragment; private HomeOrderFragment secondFragment;
private HomeLearnFragment learnFragment; private HomeLearnFragment learnFragment;
// private HomeMessageFragment thirdFragment;
// private HomePersonFragment fourFragment;
private HomeUserFragment fourFragment; private HomeUserFragment fourFragment;
private int mFirstPositon = 0; private int mFirstPositon = 0;
private BadgeView mBadgeView; private BadgeView mBadgeView;
...@@ -120,22 +118,8 @@ public class MainActivity extends BaseActivity<MainPresenter, ActivityMainBindin ...@@ -120,22 +118,8 @@ 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();
// thirdFragment = HomeMessageFragment.newInstance();
// fourFragment = HomePersonFragment.newInstance();
// if (UserManager.getInstance().getRole() == Constants.ENGINEER) {
// firstFragment = HomeFirstTabFragment.newInstance();
// mFragments = new Fragment[]{firstFragment, secondFragment, thirdFragment, fourFragment};
// mFirstPositon = 1;
mFragments = new Fragment[]{saleFragment, secondFragment, learnFragment,fourFragment}; mFragments = new Fragment[]{saleFragment, secondFragment, learnFragment,fourFragment};
mFirstPositon = 0; mFirstPositon = 0;
// } else if (UserManager.getInstance().getRole() == Constants.MANAGER_ENGINEER) {
// managerFragment = ManagerFragment.newInstance();
// mFragments = new Fragment[]{managerFragment, secondFragment, thirdFragment, fourFragment};
// mFragments = new Fragment[]{saleFragment, secondFragment, learnFragment,fourFragment};
// mFirstPositon = 0;
// mBind.tabFirst.setText(getString(R.string.send_order));
// }
// mTabs = new TextView[]{mBind.tabFirst, mBind.tabSecond, mBind.tabThird, mBind.tabFour};
mTabs = new TextView[]{mBind.tabSale, mBind.tabSecond,mBind.tabLearn, mBind.tabFour}; mTabs = new TextView[]{mBind.tabSale, mBind.tabSecond,mBind.tabLearn, mBind.tabFour};
addFragment(); addFragment();
initListener(); initListener();
...@@ -161,12 +145,6 @@ public class MainActivity extends BaseActivity<MainPresenter, ActivityMainBindin ...@@ -161,12 +145,6 @@ public class MainActivity extends BaseActivity<MainPresenter, ActivityMainBindin
} }
private void initListener() { private void initListener() {
// mBind.tabFirst.setOnClickListener(o -> showHideFragment(0, mPosition));
// mBind.tabSecond.setOnClickListener(o -> showHideFragment(1, mPosition));
// mBind.tabThird.setOnClickListener(o -> {
// showHideFragment(2, mPosition);
// });
// mBind.tabFour.setOnClickListener(o -> showHideFragment(3, mPosition));
mBind.tabSale.setOnClickListener(o -> showHideFragment(0, mPosition)); mBind.tabSale.setOnClickListener(o -> showHideFragment(0, mPosition));
mBind.tabSecond.setOnClickListener(o -> { mBind.tabSecond.setOnClickListener(o -> {
if (mPosition != 1){ if (mPosition != 1){
...@@ -180,6 +158,12 @@ public class MainActivity extends BaseActivity<MainPresenter, ActivityMainBindin ...@@ -180,6 +158,12 @@ 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 -> showHideFragment(3, mPosition)); mBind.tabFour.setOnClickListener(o -> showHideFragment(3, mPosition));
mBind.rlInvateCode.setOnTouchListener((view, motionEvent) -> true);
mBind.tvCancle.setOnClickListener(v -> {
hideInvateCodeView();
mPresenter.jumpInvateCode();
});
mBind.tvConfirm.setOnClickListener(v -> mPresenter.saveInvateCode());
} }
//提示去认证身份 //提示去认证身份
...@@ -254,19 +238,6 @@ public class MainActivity extends BaseActivity<MainPresenter, ActivityMainBindin ...@@ -254,19 +238,6 @@ public class MainActivity extends BaseActivity<MainPresenter, ActivityMainBindin
*/ */
@Override @Override
public void isShowRedIcon(int num) { public void isShowRedIcon(int num) {
// num = (int) SPUtils.get(Constants.HX_NUM, 0);
// if (mBadgeView == null) {
// mBadgeView = new BadgeView(this);
// mBadgeView.setTargetView(mBind.tabThird);
// mBadgeView.setBadgeGravity(Gravity.CENTER);
// mBadgeView.setBadgeMargin(12, 0, 0, 12);
// }
// if (num < 100) {
// mBadgeView.setText(num + "", TextView.BufferType.NORMAL);
// } else {
// mBadgeView.setText("99+");
// }
// thirdFragment.getNum(num);
} }
@Subscribe @Subscribe
...@@ -274,13 +245,6 @@ public class MainActivity extends BaseActivity<MainPresenter, ActivityMainBindin ...@@ -274,13 +245,6 @@ public class MainActivity extends BaseActivity<MainPresenter, ActivityMainBindin
if (event.num <= 0) if (event.num <= 0)
return; return;
if (mOrderBadgeView == null) { if (mOrderBadgeView == null) {
// mOrderBadgeView = new BadgeView(this);
// mOrderBadgeView.setTargetView(mBind.tabSecond);
// mOrderBadgeView.setBadgeGravity(Gravity.CENTER);
// mOrderBadgeView.setBadgeMargin(30, -8, 0, 0);
// mOrderBadgeView.setBackground(0,Color.TRANSPARENT);
// mOrderBadgeView.setTextColor(Color.parseColor("#FF5A4B"));
// mOrderBadgeView.setTextSize(18);
mOrderBadgeView = new BadgeView(this); mOrderBadgeView = new BadgeView(this);
mOrderBadgeView.setTargetView(mBind.tabSecond); mOrderBadgeView.setTargetView(mBind.tabSecond);
...@@ -292,12 +256,6 @@ public class MainActivity extends BaseActivity<MainPresenter, ActivityMainBindin ...@@ -292,12 +256,6 @@ public class MainActivity extends BaseActivity<MainPresenter, ActivityMainBindin
} else { } else {
mOrderBadgeView.setText("99+"); mOrderBadgeView.setText("99+");
} }
// if (event.num < 100) {
// mBind.tabSecond.setText(getText(R.string.order)+"("+event.num + ")");
// } else {
// mBind.tabSecond.setText(getText(R.string.order)+"(99+)");
// }
} }
@Subscribe @Subscribe
...@@ -417,6 +375,18 @@ public class MainActivity extends BaseActivity<MainPresenter, ActivityMainBindin ...@@ -417,6 +375,18 @@ public class MainActivity extends BaseActivity<MainPresenter, ActivityMainBindin
startActivity(intent); startActivity(intent);
} }
@Override
public void showInvateCodeView() {
mBind.rlInvateCode.setVisibility(View.VISIBLE);
}
@Override
public void hideInvateCodeView() {
mBind.rlInvateCode.setVisibility(View.GONE);
mUserInfo.setNewAccount("");
UserManager.getInstance().saveUser(mUserInfo);
}
/** /**
* 处理intent传来的信息. * 处理intent传来的信息.
* *
...@@ -425,26 +395,6 @@ public class MainActivity extends BaseActivity<MainPresenter, ActivityMainBindin ...@@ -425,26 +395,6 @@ public class MainActivity extends BaseActivity<MainPresenter, ActivityMainBindin
private void doAction(Intent intent) { private void doAction(Intent intent) {
InformBean info = (InformBean) intent.getSerializableExtra(Constants.MESSAGE_INFO); InformBean info = (InformBean) intent.getSerializableExtra(Constants.MESSAGE_INFO);
if (info != null) { if (info != null) {
// Map<String, String> map_ekv = new HashMap<>();
// if (info.getCategory() == 1 && (info.getFunctionType() == 2)) {
// dumpReceActivity();//待接单列表
// map_ekv.put("type", mActivity.getString(com.dayu.order.R.string.receive_list));
// } else {
// int secondIndex = 0;
// if (info.getCategory() == 1) {
// secondIndex = 0; //系统通知
// map_ekv.put("type", mActivity.getString(com.dayu.order.R.string.message_system));
// } else if (info.getCategory() == 2) {
// secondIndex = 1;//大鱼通知
// map_ekv.put("type", mActivity.getString(com.dayu.order.R.string.message_dayu));
// }
// showHideFragment(0, mPosition);
// if (thirdFragment != null) {
// thirdFragment.setIndex(secondIndex);
// thirdFragment.swtichFragment(secondIndex);
// }
// }
// MobclickAgent.onEvent(mActivity, "notificaition_click", map_ekv);
showHideFragment(0, mPosition); showHideFragment(0, mPosition);
} }
} }
......
app/src/main/java/com/dayu/bigfish/ui/SettingActivity.java
...@@ -23,6 +23,7 @@ import com.dayu.bigfish.presenter.setting.SettingPresenter; ...@@ -23,6 +23,7 @@ import com.dayu.bigfish.presenter.setting.SettingPresenter;
import com.dayu.common.Constants; import com.dayu.common.Constants;
import com.dayu.provider.router.RouterPath; import com.dayu.provider.router.RouterPath;
import com.dayu.utils.AppUtils; import com.dayu.utils.AppUtils;
import com.dayu.widgets.ChangeEnvDialog;
import com.dayu.widgets.CustomDialog; import com.dayu.widgets.CustomDialog;
import com.dayu.widgets.listener.OnCloseListener; import com.dayu.widgets.listener.OnCloseListener;
import com.dayu.widgets.listener.onDownloadListener; import com.dayu.widgets.listener.onDownloadListener;
...@@ -53,10 +54,6 @@ public class SettingActivity extends BaseActivity<SettingPresenter, ActivitySett ...@@ -53,10 +54,6 @@ public class SettingActivity extends BaseActivity<SettingPresenter, ActivitySett
//初始化切换开发环境相关布局 //初始化切换开发环境相关布局
private void initChangeEnv() { private void initChangeEnv() {
// mBind.llChangeEnv.setVisibility(Constants.CAN_CHANGE_ENV ? View.VISIBLE : View.GONE);
mBind.rlDev.setVisibility(AppUtils.isDevEnv() ? View.GONE : View.VISIBLE);
mBind.rlUat.setVisibility(AppUtils.isUatEnv() ? View.GONE : View.VISIBLE);
mBind.rlRelease.setVisibility(AppUtils.isReleaseEnv() ? View.GONE : View.VISIBLE);
if (Constants.IS_DEBUG) { if (Constants.IS_DEBUG) {
mBind.tvTitle.setOnClickListener(v -> onTitleClick()); mBind.tvTitle.setOnClickListener(v -> onTitleClick());
} }
...@@ -142,11 +139,18 @@ public class SettingActivity extends BaseActivity<SettingPresenter, ActivitySett ...@@ -142,11 +139,18 @@ public class SettingActivity extends BaseActivity<SettingPresenter, ActivitySett
private int clickCount = 0; private int clickCount = 0;
private long clickTime = 0;
public void onTitleClick() { public void onTitleClick() {
clickCount++; if (System.currentTimeMillis() - clickTime < 1500) {
if (clickCount >=5){ clickTime = System.currentTimeMillis();
mBind.llChangeEnv.setVisibility(View.VISIBLE); clickCount++;
} else {
clickTime = System.currentTimeMillis();
clickCount = 0;
}
if (clickCount >= 4) {
new ChangeEnvDialog().show(this);
clickCount = 0; clickCount = 0;
} }
} }
......
app/src/main/res/layout/activity_setting.xml
...@@ -217,95 +217,6 @@ ...@@ -217,95 +217,6 @@
<TextView style="@style/line" /> <TextView style="@style/line" />
<LinearLayout
android:visibility="gone"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:id="@+id/ll_change_env"
android:layout_marginTop="20dp"
>
<RelativeLayout
android:id="@+id/rl_dev"
android:layout_width="match_parent"
android:layout_height="54dp"
android:background="@color/cl_white"
android:onClick="@{()->presenter.toDev()}">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginLeft="13.3dp"
android:text="Dev环境"
android:textColor="@color/cl_home_title_text_color"
android:textSize="14.7sp" />
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:layout_marginRight="13.3dp"
android:src="@mipmap/list_more" />
</RelativeLayout>
<TextView style="@style/line" />
<RelativeLayout
android:id="@+id/rl_uat"
android:layout_width="match_parent"
android:layout_height="54dp"
android:background="@color/cl_white"
android:onClick="@{()->presenter.toUat()}">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginLeft="13.3dp"
android:text="Uat环境"
android:textColor="@color/cl_home_title_text_color"
android:textSize="14.7sp" />
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:layout_marginRight="13.3dp"
android:src="@mipmap/list_more" />
</RelativeLayout>
<TextView style="@style/line" />
<RelativeLayout
android:id="@+id/rl_release"
android:layout_width="match_parent"
android:layout_height="54dp"
android:background="@color/cl_white"
android:onClick="@{()->presenter.toRelease()}">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginLeft="13.3dp"
android:text="正式环境"
android:textColor="@color/cl_home_title_text_color"
android:textSize="14.7sp" />
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:layout_marginRight="13.3dp"
android:src="@mipmap/list_more" />
</RelativeLayout>
<TextView style="@style/line" />
</LinearLayout>
<Button <Button
android:id="@+id/exit_button" android:id="@+id/exit_button"
android:layout_width="match_parent" android:layout_width="match_parent"
......
app/src/main/res/mipmap-xxhdpi/logo.jpg
app/src/main/res/mipmap-xxhdpi/logo.jpg

47.4 KB | W: | H:

app/src/main/res/mipmap-xxhdpi/logo.jpg

27.7 KB | W: | H:

app/src/main/res/mipmap-xxhdpi/logo.jpg
app/src/main/res/mipmap-xxhdpi/logo.jpg
app/src/main/res/mipmap-xxhdpi/logo.jpg
app/src/main/res/mipmap-xxhdpi/logo.jpg
  • 2-up
  • Swipe
  • Onion skin
app/src/main/res/mipmap-xxhdpi/wechatimg.png
app/src/main/res/mipmap-xxhdpi/wechatimg.png

24.5 KB | W: | H:

app/src/main/res/mipmap-xxhdpi/wechatimg.png

85.2 KB | W: | H:

app/src/main/res/mipmap-xxhdpi/wechatimg.png
app/src/main/res/mipmap-xxhdpi/wechatimg.png
app/src/main/res/mipmap-xxhdpi/wechatimg.png
app/src/main/res/mipmap-xxhdpi/wechatimg.png
  • 2-up
  • Swipe
  • Onion skin
app/src/main/res/values/strings.xml
<resources> <resources>
<string name="jump_str">跳过</string>
</resources> </resources>
baseSDK/src/main/java/com/dayu/common/Constants.java
...@@ -35,18 +35,18 @@ public class Constants { ...@@ -35,18 +35,18 @@ public class Constants {
/** /**
* dev环境配置. * dev环境配置.
*/ */
public static String ENVIROMENT = "debug"; // public static String ENVIROMENT = "debug";
public static final int LOG_LEVEL = LogUtils.LEVEL_ALL; // public static final int LOG_LEVEL = LogUtils.LEVEL_ALL;
public static String BASE_URL = "http://47.94.101.239:3112"; // public static String BASE_URL = "http://47.94.101.239:3112";
public static String WEB_SOP = "http://47.94.101.239:9004/#/sop"; // public static String WEB_SOP = "http://47.94.101.239:9004/#/sop";
public static String CHECK_MULTI_WEB_SOP = "http://47.94.101.239:9004/#/manyServiceResult"; // public static String CHECK_MULTI_WEB_SOP = "http://47.94.101.239:9004/#/manyServiceResult";
public static String MULTI_WEB_SOP = "http://47.94.101.239:9004/#/manySop"; // public static String MULTI_WEB_SOP = "http://47.94.101.239:9004/#/manySop";
public static String WEB_SOP_DETAIL = "http://47.94.101.239:9004/#/sopdetail"; // public static String WEB_SOP_DETAIL = "http://47.94.101.239:9004/#/sopdetail";
public static String WEB_ZHI_SHI = "http://47.94.101.239:9004/#/detail"; // public static String WEB_ZHI_SHI = "http://47.94.101.239:9004/#/detail";
public static final String UP_PHOTO = "/file/uploadMore?targetPath=test/sp/mobile/android/business/checkApply"; // public static final String UP_PHOTO = "/file/uploadMore?targetPath=test/sp/mobile/android/business/checkApply";
public static final String UP_VIDEO = "/file/uploadVideoOne?targetPath=dev/video"; // public static final String UP_VIDEO = "/file/uploadVideoOne?targetPath=dev/video";
public static final boolean IS_DEBUG = true; // public static final boolean IS_DEBUG = true;
public static final boolean CAN_CHANGE_ENV = true; //是否显示切换开发环境菜单 // public static final boolean CAN_CHANGE_ENV = true; //是否显示切换开发环境菜单
/** /**
...@@ -68,18 +68,18 @@ public class Constants { ...@@ -68,18 +68,18 @@ public class Constants {
/** /**
* 正式环境. * 正式环境.
*/ */
// public static String ENVIROMENT = "release"; public static String ENVIROMENT = "release";
// public static int LOG_LEVEL = LogUtils.LEVEL_OFF; public static int LOG_LEVEL = LogUtils.LEVEL_OFF;
// public static String BASE_URL = "https://mobile.kf.ai"; public static String BASE_URL = "https://mobile.kf.ai";
// public static String WEB_SOP = "https://sop.kf.ai/#/sop"; public static String WEB_SOP = "https://sop.kf.ai/#/sop";
// public static String WEB_SOP_DETAIL = "https://sop.kf.ai/#/sopdetail"; public static String WEB_SOP_DETAIL = "https://sop.kf.ai/#/sopdetail";
// public static String WEB_ZHI_SHI = "https://sop.kf.ai/#/detail"; public static String WEB_ZHI_SHI = "https://sop.kf.ai/#/detail";
// public static String CHECK_MULTI_WEB_SOP = "https://sop.kf.ai/#/manyServiceResult"; public static String CHECK_MULTI_WEB_SOP = "https://sop.kf.ai/#/manyServiceResult";
// public static String MULTI_WEB_SOP = "https://sop.kf.ai/#/manySop"; public static String MULTI_WEB_SOP = "https://sop.kf.ai/#/manySop";
// public static final String UP_PHOTO = "/file/uploadMore?targetPath=online/sp/mobile/android/business/checkApply"; public static final String UP_PHOTO = "/file/uploadMore?targetPath=online/sp/mobile/android/business/checkApply";
// public static final String UP_VIDEO = "/file/uploadVideoOne?targetPath=online/video"; public static final String UP_VIDEO = "/file/uploadVideoOne?targetPath=online/video";
// public static final boolean IS_DEBUG = false; public static final boolean IS_DEBUG = false;
// public static final boolean CAN_CHANGE_ENV = false; //是否显示切换开发环境菜单 public static final boolean CAN_CHANGE_ENV = false; //是否显示切换开发环境菜单
/** /**
* 统一配置. * 统一配置.
......
baseSDK/src/main/java/com/dayu/event/UserInfo.java
...@@ -15,6 +15,7 @@ public class UserInfo { ...@@ -15,6 +15,7 @@ public class UserInfo {
*/ */
private String accountId; private String accountId;
/** /**
* 用户所属服务商id * 用户所属服务商id
*/ */
...@@ -36,6 +37,17 @@ public class UserInfo { ...@@ -36,6 +37,17 @@ public class UserInfo {
private List<Integer> roles; private List<Integer> roles;
private String mobile; private String mobile;
//不为空时弹出邀请码弹框
private String newAccount;
public String getNewAccount() {
return newAccount;
}
public void setNewAccount(String newAccount) {
this.newAccount = newAccount;
}
public String getMobile() { public String getMobile() {
return mobile; return mobile;
} }
......
baseSDK/src/main/java/com/dayu/utils/TimeCountUtil2.java 0 → 100644
package com.dayu.utils;
import android.app.Activity;
import android.os.CountDownTimer;
import android.text.Spannable;
import android.text.SpannableString;
import android.widget.TextView;
import com.dayu.baselibrary.R;
/**
* 倒计时的工具类
* 2017/8/24
*/
public class TimeCountUtil2 extends CountDownTimer {
private Activity mActivity;
private TextView btn;//按钮
private String mDescribe;
private String mAgain;
// 在这个构造方法里需要传入三个参数，一个是Activity，一个是总的时间millisInFuture，一个是countDownInterval，然后就是你在哪个按钮上做这个是，就把这个按钮传过来就可以了
public TimeCountUtil2(Activity mActivity, long millisInFuture, long countDownInterval, TextView btn) {
super(millisInFuture, countDownInterval);
this.mActivity = mActivity;
this.btn = btn;
}
public void setDescribe(String str){
mDescribe = str;
}
public void setDescribeAgain(String str){
mAgain = str;
}
@Override
public void onTick(long millisUntilFinished) {
btn.setClickable(false);//设置不能点击
btn.setText(millisUntilFinished / 1000 + mDescribe);//设置倒计时时间
btn.setTextColor(mActivity.getResources().getColor(R.color.cl_selector_hui));
Spannable span = new SpannableString(btn.getText().toString());//获取按钮的文字
btn.setText(span);
}
@Override
public void onFinish() {
btn.setText(mAgain);
btn.setClickable(true);//重新获得点击
btn.setTextColor(mActivity.getResources().getColor(R.color.white));
}
}
baseSDK/src/main/java/com/dayu/utils/UtilsUserAccountMatcher.java
...@@ -53,7 +53,7 @@ public class UtilsUserAccountMatcher { ...@@ -53,7 +53,7 @@ public class UtilsUserAccountMatcher {
} }
public static boolean isPhoneNum(String phoneNum) { public static boolean isPhoneNum(String phoneNum) {
return phonePattern.matcher(phoneNum).matches(); return !TextUtils.isEmpty(phoneNum) && phonePattern.matcher(phoneNum).matches();
} }
public static boolean isSmsCode(String str) { public static boolean isSmsCode(String str) {
......
baseSDK/src/main/java/com/dayu/widgets/ChangeEnvDialog.java 0 → 100644
package com.dayu.widgets;
import android.app.Activity;
import android.app.Dialog;
import android.text.TextUtils;
import android.view.View;
import android.view.ViewGroup;
import android.view.Window;
import android.view.WindowManager;
import android.widget.EditText;
import android.widget.TextView;
import com.dayu.baselibrary.R;
import com.dayu.utils.AppUtils;
public class ChangeEnvDialog {
public void show(Activity activity) {
View view = View.inflate(activity, R.layout.dialog_change_env, null);
Dialog mDialog = new Dialog(activity, R.style.CustomDialog);
mDialog.setContentView(view);
TextView tvDev = view.findViewById(R.id.tv_dev);
TextView tvUat = view.findViewById(R.id.tv_uat);
TextView tvRelease = view.findViewById(R.id.tv_release);
TextView tvCancle = view.findViewById(R.id.tv_cancle);
tvDev.setVisibility(AppUtils.isDevEnv() ? View.GONE : View.VISIBLE);
tvUat.setVisibility(AppUtils.isUatEnv() ? View.GONE : View.VISIBLE);
tvRelease.setVisibility(AppUtils.isReleaseEnv() ? View.GONE : View.VISIBLE);
tvDev.setOnClickListener(v -> toDev());
tvUat.setOnClickListener(v -> toUat());
tvRelease.setOnClickListener(v -> toRelease());
tvCancle.setOnClickListener(v -> mDialog.dismiss());
Window window = mDialog.getWindow();
WindowManager.LayoutParams wl = window.getAttributes();
wl.width = ViewGroup.LayoutParams.MATCH_PARENT;
wl.height = ViewGroup.LayoutParams.WRAP_CONTENT;
mDialog.onWindowAttributesChanged(wl);
mDialog.setCanceledOnTouchOutside(false);
mDialog.show();
}
public void toDev() {
AppUtils.changeToDevEnv();
AppUtils.exitApp();
}
public void toUat() {
AppUtils.changeToUatEnv();
AppUtils.exitApp();
}
public void toRelease() {
AppUtils.changeToReleaseEnv();
AppUtils.exitApp();
}
}
baseSDK/src/main/res/drawable-xxhdpi/icon_app_logo.png
baseSDK/src/main/res/drawable-xxhdpi/icon_app_logo.png

24.5 KB | W: | H:

baseSDK/src/main/res/drawable-xxhdpi/icon_app_logo.png

85.2 KB | W: | H:

baseSDK/src/main/res/drawable-xxhdpi/icon_app_logo.png
baseSDK/src/main/res/drawable-xxhdpi/icon_app_logo.png
baseSDK/src/main/res/drawable-xxhdpi/icon_app_logo.png
baseSDK/src/main/res/drawable-xxhdpi/icon_app_logo.png
  • 2-up
  • Swipe
  • Onion skin
baseSDK/src/main/res/drawable-xxhdpi/icon_dayu_logo.jpg
baseSDK/src/main/res/drawable-xxhdpi/icon_dayu_logo.jpg

47.4 KB | W: | H:

baseSDK/src/main/res/drawable-xxhdpi/icon_dayu_logo.jpg

27.7 KB | W: | H:

baseSDK/src/main/res/drawable-xxhdpi/icon_dayu_logo.jpg
baseSDK/src/main/res/drawable-xxhdpi/icon_dayu_logo.jpg
baseSDK/src/main/res/drawable-xxhdpi/icon_dayu_logo.jpg
baseSDK/src/main/res/drawable-xxhdpi/icon_dayu_logo.jpg
  • 2-up
  • Swipe
  • Onion skin
baseSDK/src/main/res/layout/dialog_change_env.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="30dp"
android:layout_centerInParent="true"
android:background="@drawable/item_shape"
android:orientation="vertical">
<TextView
android:id="@+id/tv_dev"
android:layout_width="match_parent"
android:layout_height="45dp"
android:gravity="center"
android:text="Dev 环境"
android:textColor="@color/common_text_color"
android:textSize="15sp" />
<TextView style="@style/line" />
<TextView
android:id="@+id/tv_uat"
android:layout_width="match_parent"
android:layout_height="45dp"
android:gravity="center"
android:text="UAT 环境"
android:textColor="@color/common_text_color"
android:textSize="15sp" />
<TextView style="@style/line" />
<TextView
android:id="@+id/tv_release"
android:layout_width="match_parent"
android:layout_height="45dp"
android:gravity="center"
android:text="正式环境"
android:textColor="@color/common_text_color"
android:textSize="15sp" />
<TextView style="@style/line" />
<TextView
android:background="@drawable/btn_blue_commom"
android:layout_margin="30dp"
android:id="@+id/tv_cancle"
android:layout_width="match_parent"
android:layout_height="45dp"
android:gravity="center"
android:text="取消"
android:textColor="@color/white"
android:textSize="15sp" />
</LinearLayout>
</RelativeLayout>
baseSDK/src/main/res/values/strings.xml
...@@ -580,6 +580,7 @@ ...@@ -580,6 +580,7 @@
<string name="certification_error">联网授权失败！请检查网络或找服务商</string> <string name="certification_error">联网授权失败！请检查网络或找服务商</string>
<string name="certification_getphoto_error">获取相机权限失败</string> <string name="certification_getphoto_error">获取相机权限失败</string>
<string name="next_step">下一步</string> <string name="next_step">下一步</string>
<string name="register_login">注册登录</string>
<string name="accredit_error">人脸识别授权失败</string> <string name="accredit_error">人脸识别授权失败</string>
<string name="certification_success">认证成功</string> <string name="certification_success">认证成功</string>
<string name="certification_fail">认证失败</string> <string name="certification_fail">认证失败</string>
......
baseSDK/src/main/res/values/styles.xml
...@@ -360,4 +360,13 @@ ...@@ -360,4 +360,13 @@
<item name="colorControlNormal">@color/tv_cl</item> <item name="colorControlNormal">@color/tv_cl</item>
<item name="colorControlActivated">@color/bg_button</item> <item name="colorControlActivated">@color/bg_button</item>
</style> </style>
<style name="tv_btn">
<item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:gravity">center</item>
<item name="android:textSize">14sp</item>
<item name="android:textColor">@color/white</item>
</style>
</resources> </resources>
build.gradle
...@@ -5,8 +5,8 @@ buildscript { ...@@ -5,8 +5,8 @@ buildscript {
ext.build_tools_version = "27.0.3" ext.build_tools_version = "27.0.3"
ext.min_sdk_version = 16 ext.min_sdk_version = 16
ext.target_sdk_version = 26 ext.target_sdk_version = 26
ext.version_code = 250 ext.version_code = 252
ext.verson_name = "2.5.0" ext.verson_name = "2.5.2"
ext.gradle_version = '3.1.4' ext.gradle_version = '3.1.4'
ext.isReleaseMinify = false ext.isReleaseMinify = false
ext.isDebugMinify = false ext.isDebugMinify = false
......
userCenter/src/main/java/com/dayu/usercenter/presenter/pwlogin/PwLoginPresenter.java
...@@ -145,25 +145,34 @@ public class PwLoginPresenter extends PwLoginContract.Presenter { ...@@ -145,25 +145,34 @@ public class PwLoginPresenter extends PwLoginContract.Presenter {
@Override @Override
public void dumpAndSave(UserInfo info) { public void dumpAndSave(UserInfo info) {
LogUtils.e("HxAccount: "+info.getHxAccount()); LogUtils.e("HxAccount: "+info.getHxAccount());
switch (UserManager.getInstance().getRole(info)) { if (info.getRoles() != null && info.getRoles().contains(2)){
// case Constants.MANAGER: info.setSiteId(-1);
// UserManager.getInstance().saveUser(info); UserManager.getInstance().saveUser(info);
// loginHx(info.getHxAccount(), info.getHxPwd()); ARouter.getInstance().build(RouterPath.PATH_MAIN).navigation();
// getStations(Integer.parseInt(info.getAccountId())); }else {
// break; ToastUtils.showShortToast(UIUtils.getString(R.string.login_faile));
case Constants.ENGINEER:
case Constants.MANAGER_ENGINEER:
if (info.getDetectStatus() == 1 || info.getDetectStatus() == 2 || info.getDetectStatus() == 3) {
UserManager.getInstance().saveUser(info);
getSiteId(info);
} else {
ToastUtils.showShortToast(UIUtils.getString(R.string.login_faile));
}
break;
default:
ToastUtils.showShortToast(UIUtils.getString(R.string.login_faile));
break;
} }
// switch (UserManager.getInstance().getRole(info)) {
//// case Constants.MANAGER:
//// UserManager.getInstance().saveUser(info);
//// loginHx(info.getHxAccount(), info.getHxPwd());
//// getStations(Integer.parseInt(info.getAccountId()));
//// break;
// case Constants.ENGINEER:
// case Constants.MANAGER_ENGINEER:
// if (info.getDetectStatus() == 1 || info.getDetectStatus() == 2 || info.getDetectStatus() == 3) {
// UserManager.getInstance().saveUser(info);
// getSiteId(info);
// } else {
// LogUtils.e("fail0");
// ToastUtils.showShortToast(UIUtils.getString(R.string.login_faile));
// }
// break;
// default:
// LogUtils.e("fail1");
// ToastUtils.showShortToast(UIUtils.getString(R.string.login_faile));
// break;
// }
} }
private void showLoginDialog() { private void showLoginDialog() {
......
userCenter/src/main/java/com/dayu/usercenter/presenter/smslogin/SmsLoginPresenter.java
...@@ -29,16 +29,21 @@ import com.hyphenate.chat.EMClient; ...@@ -29,16 +29,21 @@ import com.hyphenate.chat.EMClient;
public class SmsLoginPresenter extends SmsLoginContract.Presenter { public class SmsLoginPresenter extends SmsLoginContract.Presenter {
private String mPhone; private String mPhone;
public ObservableField<String> phoneNume = new ObservableField<>(); public ObservableField<String> phoneNume = new ObservableField<>();
public ObservableField<String> code = new ObservableField<>();
@Override @Override
public void onAttached() { public void onAttached() {
Bundle bundle = mView.getBundle(); Bundle bundle = mView.getBundle();
mPhone = bundle.getString(UserConstant.PHONE); if (bundle != null) {
phoneNume.set(mPhone); mPhone = bundle.getString(UserConstant.PHONE);
phoneNume.set(mPhone);
}
} }
@Override @Override
public void sendCode(int type) { public void sendCode(int type) {
if (TextUtils.isEmpty(mPhone) && phoneNume.get() != null)
mPhone = phoneNume.get();
mView.showDialog(); mView.showDialog();
if (type == 1) { if (type == 1) {
mView.changeCodeBtn(); mView.changeCodeBtn();
...@@ -54,6 +59,11 @@ public class SmsLoginPresenter extends SmsLoginContract.Presenter { ...@@ -54,6 +59,11 @@ public class SmsLoginPresenter extends SmsLoginContract.Presenter {
}, throwable -> mView.showToast(R.string.send_code_faile))); }, throwable -> mView.showToast(R.string.send_code_faile)));
} }
public void login() {
if (code.get() != null)
login(code.get());
}
@Override @Override
public void login(String code) { public void login(String code) {
mView.showDialog(); mView.showDialog();
...@@ -116,29 +126,41 @@ public class SmsLoginPresenter extends SmsLoginContract.Presenter { ...@@ -116,29 +126,41 @@ public class SmsLoginPresenter extends SmsLoginContract.Presenter {
@Override @Override
public void dumpAndSave(UserInfo info) { public void dumpAndSave(UserInfo info) {
// List<Integer> role = info.getRoles(); if (info.getRoles() != null && info.getRoles().contains(2)){
// role.clear(); info.setSiteId(-1);
// role.add(3); UserManager.getInstance().saveUser(info);
// info.setRoles(role); ARouter.getInstance().build(RouterPath.PATH_MAIN).navigation();
switch (UserManager.getInstance().getRole(info)) { }else {
// case Constants.MANAGER: ToastUtils.showShortToast(UIUtils.getString(R.string.login_faile));
// UserManager.getInstance().saveUser(info);
// loginHx(info.getHxAccount(), info.getHxPwd());
// getStations(Integer.parseInt(info.getAccountId()));
// break;
case Constants.ENGINEER:
case Constants.MANAGER_ENGINEER:
if (info.getDetectStatus() == 1 || info.getDetectStatus() == 2 || info.getDetectStatus() == 3) {
UserManager.getInstance().saveUser(info);
getSiteId(info);
} else {
ToastUtils.showShortToast(UIUtils.getString(R.string.login_faile));
}
break;
default:
ToastUtils.showShortToast(UIUtils.getString(R.string.login_faile));
break;
} }
//// List<Integer> role = info.getRoles();
//// role.clear();
//// role.add(3);
//// info.setRoles(role);
// switch (UserManager.getInstance().getRole(info)) {
//// case Constants.MANAGER:
//// UserManager.getInstance().saveUser(info);
//// loginHx(info.getHxAccount(), info.getHxPwd());
//// getStations(Integer.parseInt(info.getAccountId()));
//// break;
// case Constants.ENGINEER:
// case Constants.MANAGER_ENGINEER:
// if (info.getDetectStatus() == 1 || info.getDetectStatus() == 2 || info.getDetectStatus() == 3) {
// info.setSiteId(-1);
// UserManager.getInstance().saveUser(info);
// ARouter.getInstance().build(RouterPath.PATH_MAIN).navigation();
//
//// UserManager.getInstance().saveUser(info);
//// getSiteId(info);
// } else {
// ToastUtils.showShortToast(UIUtils.getString(R.string.login_faile));
// }
// break;
// default:
// ToastUtils.showShortToast(UIUtils.getString(R.string.login_faile));
// break;
// }
} }
@Override @Override
...@@ -187,7 +209,7 @@ public class SmsLoginPresenter extends SmsLoginContract.Presenter { ...@@ -187,7 +209,7 @@ public class SmsLoginPresenter extends SmsLoginContract.Presenter {
break; break;
default: default:
// ToastUtils.showShortToast(R.string.login_faile); // ToastUtils.showShortToast(R.string.login_faile);
dealSiteId(info,-1); dealSiteId(info, -1);
break; break;
} }
})); }));
......
userCenter/src/main/java/com/dayu/usercenter/ui/activity/SmsLoginActivity.java
...@@ -8,6 +8,7 @@ import android.text.TextUtils; ...@@ -8,6 +8,7 @@ import android.text.TextUtils;
import android.view.View; import android.view.View;
import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.facade.annotation.Route;
import com.dayu.base.ui.activity.BaseActivity;
import com.dayu.base.ui.activity.DataBindingActivity; import com.dayu.base.ui.activity.DataBindingActivity;
import com.dayu.common.BaseApplication; import com.dayu.common.BaseApplication;
import com.dayu.common.BaseConstant; import com.dayu.common.BaseConstant;
...@@ -17,10 +18,17 @@ import com.dayu.usercenter.R; ...@@ -17,10 +18,17 @@ import com.dayu.usercenter.R;
import com.dayu.usercenter.common.UserConstant; import com.dayu.usercenter.common.UserConstant;
import com.dayu.usercenter.databinding.ActivitySmsLoginBinding; import com.dayu.usercenter.databinding.ActivitySmsLoginBinding;
import com.dayu.usercenter.event.RegisterSuccessEvent; import com.dayu.usercenter.event.RegisterSuccessEvent;
import com.dayu.usercenter.presenter.smslogin.SmsLoginContract;
import com.dayu.usercenter.presenter.smslogin.SmsLoginPresenter;
import com.dayu.utils.AppUtils; import com.dayu.utils.AppUtils;
import com.dayu.utils.TimeCountUtil;
import com.dayu.utils.TimeCountUtil2;
import com.dayu.utils.ToastUtils; import com.dayu.utils.ToastUtils;
import com.dayu.utils.UIUtils; import com.dayu.utils.UIUtils;
import com.dayu.utils.UtilsUserAccountMatcher; import com.dayu.utils.UtilsUserAccountMatcher;
import com.dayu.widgets.ChangeEnvDialog;
import com.dayu.widgets.CustomDialog;
import com.dayu.widgets.listener.OnCloseListener;
import com.umeng.analytics.MobclickAgent; import com.umeng.analytics.MobclickAgent;
import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.EventBus;
...@@ -33,7 +41,7 @@ import org.greenrobot.eventbus.Subscribe; ...@@ -33,7 +41,7 @@ import org.greenrobot.eventbus.Subscribe;
*/ */
@Route(path = BaseConstant.PATH_LOGIN) @Route(path = BaseConstant.PATH_LOGIN)
public class SmsLoginActivity extends DataBindingActivity<ActivitySmsLoginBinding> { public class SmsLoginActivity extends BaseActivity<SmsLoginPresenter,ActivitySmsLoginBinding> implements SmsLoginContract.View {
@Override @Override
public int getLayoutId() { public int getLayoutId() {
return R.layout.activity_sms_login; return R.layout.activity_sms_login;
...@@ -53,6 +61,28 @@ public class SmsLoginActivity extends DataBindingActivity<ActivitySmsLoginBindin ...@@ -53,6 +61,28 @@ public class SmsLoginActivity extends DataBindingActivity<ActivitySmsLoginBindin
mBind.environment.setVisibility(View.VISIBLE); mBind.environment.setVisibility(View.VISIBLE);
mBind.environment.setText(String.format(getString(R.string.enviroment_demons), versionCode)); mBind.environment.setText(String.format(getString(R.string.enviroment_demons), versionCode));
} }
setListener();
if (Constants.IS_DEBUG) {
mBind.ivLogo.setOnClickListener(v -> onTitleClick());
}
}
private void setListener() {
// mBind.next.setOnClickListener(v -> {
// UIUtils.hideSoftInputFromWindow(mActivity);
// String phone = mBind.mobile.getText().toString().trim();
// if (!UtilsUserAccountMatcher.isPhoneNum(phone)) {
// ToastUtils.showShortToast(R.string.alipay_phone_error);
// } else {
// Intent intent = new Intent(mActivity, SmsCodeActivity.class);
// Bundle bundle = new Bundle();
// bundle.putString(UserConstant.PHONE, phone);
// intent.putExtra(Constants.BUNDLE, bundle);
// startActivity(intent, bundle);
// }
// });
mBind.tvAgreement.setOnClickListener(v -> { mBind.tvAgreement.setOnClickListener(v -> {
Intent intent = new Intent(mActivity, AgreementActivity.class); Intent intent = new Intent(mActivity, AgreementActivity.class);
startActivity(intent); startActivity(intent);
...@@ -61,28 +91,23 @@ public class SmsLoginActivity extends DataBindingActivity<ActivitySmsLoginBindin ...@@ -61,28 +91,23 @@ public class SmsLoginActivity extends DataBindingActivity<ActivitySmsLoginBindin
mBind.mobile.addTextChangedListener(new MyTextWatcher() { mBind.mobile.addTextChangedListener(new MyTextWatcher() {
@Override @Override
public void afterTextChanged(Editable s) { public void afterTextChanged(Editable s) {
if (!TextUtils.isEmpty(s.toString())) { isMatch(s.toString(), mPresenter.code.get());
mBind.next.setEnabled(true); if (UtilsUserAccountMatcher.isPhoneNum(s.toString())) {
mBind.next.setAlpha(1); mBind.getCode.setEnabled(true);
mBind.getCode.setAlpha(1);
} else { } else {
mBind.next.setEnabled(false); mBind.getCode.setEnabled(false);
mBind.next.setAlpha(0.35f); mBind.getCode.setAlpha(0.35f);
} }
} }
}); });
mBind.next.setOnClickListener(v -> { mBind.code.addTextChangedListener(new MyTextWatcher() {
UIUtils.hideSoftInputFromWindow(mActivity); @Override
String phone = mBind.mobile.getText().toString().trim(); public void afterTextChanged(Editable s) {
if (!UtilsUserAccountMatcher.isPhoneNum(phone)) { isMatch(mPresenter.phoneNume.get(), s.toString());
ToastUtils.showShortToast(R.string.alipay_phone_error);
} else {
Intent intent = new Intent(mActivity, SmsCodeActivity.class);
Bundle bundle = new Bundle();
bundle.putString(UserConstant.PHONE, phone);
intent.putExtra(Constants.BUNDLE, bundle);
startActivity(intent, bundle);
} }
}); });
mBind.getCode.setEnabled(false);
mBind.next.setEnabled(false); mBind.next.setEnabled(false);
mBind.useAccount.setOnClickListener(v -> { mBind.useAccount.setOnClickListener(v -> {
Intent intent = new Intent(mActivity, PwLoginActivity.class); Intent intent = new Intent(mActivity, PwLoginActivity.class);
...@@ -97,14 +122,82 @@ public class SmsLoginActivity extends DataBindingActivity<ActivitySmsLoginBindin ...@@ -97,14 +122,82 @@ public class SmsLoginActivity extends DataBindingActivity<ActivitySmsLoginBindin
}); });
} }
public void isMatch(String phone, String code) {
if (UtilsUserAccountMatcher.isPhoneNum(phone) && UtilsUserAccountMatcher.isSmsCode(code)) {
mBind.next.setAlpha(1);
mBind.next.setEnabled(true);
} else {
mBind.next.setAlpha(0.35f);
mBind.next.setEnabled(false);
}
}
@Subscribe @Subscribe
public void registerSuccess(RegisterSuccessEvent event){ public void registerSuccess(RegisterSuccessEvent event){
finish(); finish();
} }
@Override @Override
public void setPresenter() {
mBind.setPresenter(mPresenter);
}
@Override
protected void onDestroy() { protected void onDestroy() {
super.onDestroy(); super.onDestroy();
EventBus.getDefault().unregister(this); EventBus.getDefault().unregister(this);
} }
@Override
public void changeCodeBtn() {
TimeCountUtil2 timeCountUtil = new TimeCountUtil2(mActivity, 60000, 1000, mBind.getCode);
timeCountUtil.setDescribe(getString(R.string.send_code_agian));
timeCountUtil.setDescribeAgain(UIUtils.getString(R.string.send_again));
timeCountUtil.start();
MobclickAgent.onEvent(mActivity, "sms_code");
}
@Override
public void changeVoiceCodeBtn() {
mBind.tvVoiceCode.setTextColor(getResources().getColor(R.color.cl_text));
mBind.tvVoiceCode.setClickable(false);
MobclickAgent.onEvent(mActivity, "sms_voice");
}
@Override
public void showLoginDialog(OnCloseListener listener) {
CustomDialog customDialog = new CustomDialog(mActivity, R.style.CustomDialog, getString(R.string.engineer_identity_not_audite)
, listener);
customDialog.setTitle(getString(R.string.certification))
.setPositiveButton(getString(R.string.go_certification))
.setNegativeButton(getString(R.string.skip));
customDialog.show();
}
@Override
public void setError(String str) {
if (TextUtils.isEmpty(str)) {
mBind.code.setText("");
} else {
mBind.code.setText("");
}
}
private int clickCount = 0;
private long clickTime = 0;
public void onTitleClick() {
if (System.currentTimeMillis() - clickTime < 1500) {
clickTime = System.currentTimeMillis();
clickCount++;
} else {
clickTime = System.currentTimeMillis();
clickCount = 0;
}
if (clickCount >= 4) {
new ChangeEnvDialog().show(this);
clickCount = 0;
}
}
} }
userCenter/src/main/res/layout/activity_pwlogin_layout.xml
...@@ -133,6 +133,7 @@ ...@@ -133,6 +133,7 @@
android:textSize="15sp" /> android:textSize="15sp" />
<TextView <TextView
android:visibility="gone"
android:id="@+id/tv_register" android:id="@+id/tv_register"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
......
userCenter/src/main/res/layout/activity_sms_login.xml
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<layout> <layout>
<data>
<variable
name="presenter"
type="com.dayu.usercenter.presenter.smslogin.SmsLoginPresenter" />
</data>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="match_parent"
...@@ -16,21 +22,31 @@ ...@@ -16,21 +22,31 @@
android:visibility="gone" /> android:visibility="gone" />
<TextView <TextView
android:visibility="gone"
android:id="@+id/tv_title" android:id="@+id/tv_title"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:layout_marginBottom="59dp" android:layout_marginBottom="59dp"
android:layout_marginTop="127dp" android:layout_marginTop="100dp"
android:text="@string/sms_login" android:text="@string/sms_login"
android:textColor="@color/default_text_color" android:textColor="@color/default_text_color"
android:textSize="24sp" /> android:textSize="24sp" />
<ImageView
android:id="@+id/iv_logo"
android:layout_width="100dp"
android:layout_height="100dp"
android:layout_centerHorizontal="true"
android:layout_marginTop="50dp"
android:layout_marginBottom="60dp"
android:src="@drawable/icon_app_logo" />
<TextView <TextView
android:id="@+id/tv_86" android:id="@+id/tv_86"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@+id/tv_title" android:layout_below="@+id/iv_logo"
android:layout_marginLeft="56dp" android:layout_marginLeft="56dp"
android:layout_marginRight="38dp" android:layout_marginRight="38dp"
android:text="@string/sms_86" android:text="@string/sms_86"
...@@ -39,38 +55,116 @@ ...@@ -39,38 +55,116 @@
<EditText <EditText
android:id="@+id/mobile" android:id="@+id/mobile"
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_marginRight="30dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@+id/tv_title" android:layout_below="@+id/iv_logo"
android:layout_toRightOf="@id/tv_86" android:layout_toRightOf="@+id/tv_86"
android:background="@null" android:background="@null"
android:hint="@string/tv_login_phone_editext_hint" android:hint="@string/tv_login_phone_editext_hint"
android:inputType="phone" android:inputType="phone"
android:text="@={presenter.phoneNume}"
android:maxLength="11" android:maxLength="11"
android:textColor="@color/default_text_color" android:textColor="@color/default_text_color"
android:textSize="17sp" /> android:textSize="16sp" />
<View <View
android:id="@+id/line" android:id="@+id/line"
android:layout_width="250dp" android:layout_width="match_parent"
android:layout_marginLeft="55dp"
android:layout_marginRight="30dp"
android:layout_height="1dp" android:layout_height="1dp"
android:layout_below="@+id/mobile" android:layout_below="@+id/mobile"
android:layout_centerHorizontal="true"
android:layout_marginTop="7.5dp" android:layout_marginTop="7.5dp"
android:background="@color/cl_line" /> android:background="@color/cl_line" />
<LinearLayout
android:id="@+id/ll_code"
android:layout_below="@+id/line"
android:layout_width="match_parent"
android:layout_height="40dp"
android:layout_marginTop="15dp"
android:gravity="center_vertical"
android:paddingLeft="53dp"
>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="20dp"
android:text="@string/sms_code"
android:textColor="@color/editext_color"
android:textSize="16sp" />
<EditText
android:id="@+id/code"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_weight="1"
android:background="@null"
android:hint="@string/input_sms_code"
android:inputType="number"
android:text="@={presenter.code}"
android:textColor="@color/default_text_color"
android:maxLength="10"
android:textSize="16sp" />
<View
android:visibility="gone"
android:layout_width="1dp"
android:layout_height="match_parent"
android:background="@color/cl_line" />
<TextView
android:id="@+id/get_code"
android:layout_width="wrap_content"
android:layout_height="35dp"
android:paddingLeft="10dp"
android:paddingRight="10dp"
android:layout_marginRight="30dp"
android:gravity="center"
android:alpha="0.35"
android:background="@drawable/btn_blue_commom"
android:onClick="@{()->presenter.sendCode(1)}"
android:text="@string/tv_login_register_button_text"
android:textColor="@color/white" />
</LinearLayout>
<View
android:id="@+id/line_code"
android:layout_width="match_parent"
android:layout_marginLeft="55dp"
android:layout_marginRight="30dp"
android:layout_height="1dp"
android:layout_below="@+id/ll_code"
android:background="@color/cl_line" />
<TextView
android:id="@+id/tv_voice_code"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="15dp"
android:layout_below="@+id/line_code"
android:onClick="@{()->presenter.sendCode(2)}"
android:layout_centerHorizontal="true"
android:text="@string/voice_code_notice"
android:textColor="@color/cl_receiving_order_item_data"
android:textSize="14sp" />
<TextView <TextView
android:id="@+id/next" android:id="@+id/next"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="47dp" android:layout_height="47dp"
android:layout_below="@+id/line" android:layout_below="@+id/tv_voice_code"
android:layout_marginLeft="25dp" android:layout_marginLeft="25dp"
android:layout_marginRight="25dp" android:layout_marginRight="25dp"
android:layout_marginTop="38.5dp" android:layout_marginTop="30dp"
android:alpha="0.35" android:alpha="0.35"
android:background="@drawable/tab_blue_react" android:background="@drawable/tab_blue_react"
android:gravity="center" android:gravity="center"
android:text="@string/next_step" android:text="@string/register_login"
android:onClick="@{()->presenter.login()}"
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="16sp" /> android:textSize="16sp" />
...@@ -79,11 +173,13 @@ ...@@ -79,11 +173,13 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@+id/next" android:layout_below="@+id/next"
android:layout_centerHorizontal="true" android:layout_alignParentRight="true"
android:layout_marginRight="25dp"
android:layout_marginTop="25dp" android:layout_marginTop="25dp"
android:text="@string/use_account_login" android:text="@string/use_account_login"
android:textColor="@color/bg_button" /> android:textColor="@color/text_color" />
<TextView <TextView
android:visibility="gone"
android:id="@+id/tv_register" android:id="@+id/tv_register"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
...@@ -91,7 +187,6 @@ ...@@ -91,7 +187,6 @@
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:layout_marginTop="25dp" android:layout_marginTop="25dp"
android:text="@string/register_account" android:text="@string/register_account"
android:layout_toRightOf="@id/use_account"
android:layout_marginLeft="25dp" android:layout_marginLeft="25dp"
android:textColor="@color/blue_register" /> android:textColor="@color/blue_register" />
......
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