Skip to content

android / dayu

Go to a project
Commit 246edf7b by luofan
Options

feat:v302增加注销账号功能

parent a7a59a7f dev_xx_web … dev dev_xx dev_xx_241116 dev_xx_250108_toast dev_xx_250224_report dev_xx_250414_sop dev20230405
Inline Side-by-side
Showing with 321 additions and 36 deletions
app/src/main/AndroidManifest.xml
...@@ -159,6 +159,11 @@ ...@@ -159,6 +159,11 @@
<activity <activity
android:name=".ui.FeedBackActivity" android:name=".ui.FeedBackActivity"
android:screenOrientation="portrait" /> android:screenOrientation="portrait" />
<activity
android:name=".ui.LogoutActivity"
android:screenOrientation="portrait" />
<activity <activity
android:name=".ui.MainActivity" android:name=".ui.MainActivity"
android:launchMode="singleTask" android:launchMode="singleTask"
......
app/src/main/java/com/dayu/bigfish/api/APIService.java
...@@ -5,12 +5,14 @@ import com.dayu.base.api.protocol.BaseResponse; ...@@ -5,12 +5,14 @@ import com.dayu.base.api.protocol.BaseResponse;
import com.dayu.bigfish.api.protocol.BindUmengData; import com.dayu.bigfish.api.protocol.BindUmengData;
import com.dayu.bigfish.api.protocol.VersionInfo; import com.dayu.bigfish.api.protocol.VersionInfo;
import com.dayu.common.Constants; import com.dayu.common.Constants;
import com.dayu.event.UserInfo;
import io.reactivex.Observable; import io.reactivex.Observable;
import okhttp3.RequestBody; import okhttp3.RequestBody;
import retrofit2.http.Body; import retrofit2.http.Body;
import retrofit2.http.GET; import retrofit2.http.GET;
import retrofit2.http.POST; import retrofit2.http.POST;
import retrofit2.http.PUT;
import retrofit2.http.Path; import retrofit2.http.Path;
import retrofit2.http.Query; import retrofit2.http.Query;
...@@ -87,5 +89,23 @@ public interface APIService { ...@@ -87,5 +89,23 @@ public interface APIService {
Observable<BaseResponse<Boolean>> setInvateCode(@Query("engineerId") int engineerId, Observable<BaseResponse<Boolean>> setInvateCode(@Query("engineerId") int engineerId,
@Query("inviterCode") String inviterCode); @Query("inviterCode") String inviterCode);
/**
* 获取接单状态.
*/
@GET(Constants.API_7100+"/engineerInfo/mobile/accountId/{id}")
Observable<BaseResponse<UserInfo>> getWorkStatus(@Path("id") int id);
/**
* 更改接单状态.
*/
@PUT(Constants.API_7100+"/engineerInfo/accountId")
Observable<BaseResponse<Boolean>> changeWorkStatus(@Body RequestBody body);
/**
* 获取接单状态.
*/
@POST(Constants.API_7100+"/accountDeleteBak/deleteAccount")
Observable<BaseResponse<Boolean>> deleteAccount(@Body RequestBody body);
} }
app/src/main/java/com/dayu/bigfish/ui/LogoutActivity.java 0 → 100755
package com.dayu.bigfish.ui;
import com.dayu.base.api.Api;
import com.dayu.base.ui.activity.BaseActivity;
import com.dayu.bigfish.R;
import com.dayu.bigfish.api.APIService;
import com.dayu.bigfish.databinding.ActivityLogoutBinding;
import com.dayu.bigfish.presenter.setting.SettingPresenter;
import com.dayu.usercenter.ui.activity.SmsLoginActivity;
import com.dayu.utils.ToastUtils;
import org.json.JSONException;
import org.json.JSONObject;
import okhttp3.MediaType;
import okhttp3.RequestBody;
/**
* 注销页面
* 2017/9/2.
*/
public class LogoutActivity extends BaseActivity<SettingPresenter, ActivityLogoutBinding> {
@Override
public int getLayoutId() {
return R.layout.activity_logout;
}
@Override
public void initView() {
initUser();
mBind.logout.setOnClickListener(v -> {
JSONObject jsonObject = new JSONObject();
try {
jsonObject.put("id", mUserId);
jsonObject.put("created", mUserInfo.getAccountName());
jsonObject.put("remark", "个人主动注销");
} catch (JSONException e) {
e.printStackTrace();
}
RequestBody requestBody = RequestBody.create(MediaType.parse("application/json"), jsonObject.toString());
Api.getService(APIService.class).deleteAccount(requestBody).compose(Api.applySchedulers())
.subscribe(mPresenter.baseObserver(data -> {
ToastUtils.showShortToast("注销成功!");
startActivity(SmsLoginActivity.class);
finish();
}));
});
mBind.cancel.setOnClickListener(v -> finish());
}
@Override
public void setPresenter() {
}
}
app/src/main/java/com/dayu/bigfish/ui/SettingActivity.java
...@@ -5,11 +5,14 @@ import android.app.NotificationManager; ...@@ -5,11 +5,14 @@ import android.app.NotificationManager;
import android.content.Context; import android.content.Context;
import android.os.Environment; import android.os.Environment;
import android.support.v4.app.NotificationCompat; import android.support.v4.app.NotificationCompat;
import android.view.View;
import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.facade.annotation.Route;
import com.dayu.base.api.Api;
import com.dayu.base.api.DownloadService; import com.dayu.base.api.DownloadService;
import com.dayu.base.ui.activity.BaseActivity; import com.dayu.base.ui.activity.BaseActivity;
import com.dayu.bigfish.R; import com.dayu.bigfish.R;
import com.dayu.bigfish.api.APIService;
import com.dayu.bigfish.api.protocol.VersionInfo; import com.dayu.bigfish.api.protocol.VersionInfo;
import com.dayu.bigfish.databinding.ActivitySettingBinding; import com.dayu.bigfish.databinding.ActivitySettingBinding;
import com.dayu.bigfish.presenter.setting.SettingContract; import com.dayu.bigfish.presenter.setting.SettingContract;
...@@ -25,9 +28,14 @@ import com.dayu.widgets.listener.OnCloseListener; ...@@ -25,9 +28,14 @@ import com.dayu.widgets.listener.OnCloseListener;
import com.dayu.widgets.listener.onDownloadListener; import com.dayu.widgets.listener.onDownloadListener;
import org.greenrobot.eventbus.Subscribe; import org.greenrobot.eventbus.Subscribe;
import org.json.JSONException;
import org.json.JSONObject;
import java.io.File; import java.io.File;
import okhttp3.MediaType;
import okhttp3.RequestBody;
/** /**
* 设置页面 * 设置页面
* 2017/9/2. * 2017/9/2.
...@@ -43,10 +51,45 @@ public class SettingActivity extends BaseActivity<SettingPresenter, ActivitySett ...@@ -43,10 +51,45 @@ public class SettingActivity extends BaseActivity<SettingPresenter, ActivitySett
@Override @Override
public void initView() { public void initView() {
initUser();
mBind.toolbar.setNavigationOnClickListener(v -> dumpBack()); mBind.toolbar.setNavigationOnClickListener(v -> dumpBack());
mBind.tvTitle.setText(getString(R.string.setting_center)); mBind.tvTitle.setText(getString(R.string.setting_center));
initChangeEnv(); initChangeEnv();
mBind.receiveOrder.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
int status;
if (mBind.receiveOrder.switchButton) {
status = 2;
} else {
status = 1;
}
JSONObject jsonObject = new JSONObject();
try {
jsonObject.put("accountId", mUserId);
jsonObject.put("workStatus", status);
} catch (JSONException e) {
e.printStackTrace();
}
RequestBody requestBody = RequestBody.create(MediaType.parse("application/json"), jsonObject.toString());
Api.getService(APIService.class).changeWorkStatus(requestBody).compose(Api.applySchedulers())
.subscribe(mPresenter.baseObserver(data -> {
}));
mBind.receiveOrder.setSwitchButton(!mBind.receiveOrder.switchButton);
}
});
Api.getService(APIService.class).getWorkStatus(mUserId).compose(Api.applySchedulers())
.subscribe(mPresenter.baseObserver(data -> {
if (data.getWorkStatus() == 1) {
mBind.receiveOrder.setSwitchButton(true);
} else {
mBind.receiveOrder.setSwitchButton(false);
}
}));
mBind.logoutRl.setOnClickListener(v->{
startActivity(LogoutActivity.class);
});
} }
//初始化切换开发环境相关布局 //初始化切换开发环境相关布局
......
app/src/main/res/drawable/btn_red_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/colorRed"/>
</shape>
\ No newline at end of file
app/src/main/res/layout/activity_logout.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<layout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<android.support.v7.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:layout_marginBottom="2dp"
android:background="?attr/colorPrimary"
app:navigationIcon="@drawable/back_btn_normal">
<TextView
android:id="@+id/tv_title"
android:text="注销账号"
style="@style/toolbar_title" />
</android.support.v7.widget.Toolbar>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:textSize="14dp"
android:paddingTop="20dp"
android:textColor="@color/default_editext_color"
android:lineSpacingMultiplier="1.5"
android:text="尊敬的师傅，你是不是遇到了以下问题：\n【一直看不到工单信息列表】\n提交实名身份信息，平台审核通过就可以接单了。\n【能看到，但总是接不到工单】\n提交实名身份信息，平台审核通过就可以接单了。\n【接单提醒电话太多，忙不过来了】\n 你可以临时关掉接单开关，想接单时再打开就可以了。 \n【换行业工作了，永远不想接单了】\n 劳动人民挣钱，做哪行都不容易，要不再考虑考虑？" />
<LinearLayout
android:layout_width="match_parent"
android:layout_marginTop="20dp"
android:orientation="horizontal"
android:gravity="center"
android:layout_height="wrap_content">
<TextView
android:id="@+id/logout"
android:layout_width="150dp"
android:layout_height="50dp"
android:gravity="center"
android:textSize="15dp"
android:textColor="@color/white"
android:background="@drawable/btn_red_react_4"
android:layout_marginEnd="20dp"
android:text="彻底注销账号" />
<TextView
android:id="@+id/cancel"
android:layout_width="150dp"
android:layout_height="50dp"
android:gravity="center"
android:textSize="15dp"
android:textColor="@color/white"
android:background="@drawable/btn_blue_react_4"
android:text="再想一想" />
</LinearLayout>
</LinearLayout>
</layout>
\ No newline at end of file
app/src/main/res/layout/activity_setting.xml
...@@ -66,6 +66,34 @@ ...@@ -66,6 +66,34 @@
<TextView style="@style/line" /> <TextView style="@style/line" />
<RelativeLayout <RelativeLayout
android:id="@+id/receiveOrderRl"
android:layout_width="match_parent"
android:layout_height="54dp"
android:background="@color/cl_white">
<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" />
<com.dayu.widgets.SwitchImage
android:id="@+id/receiveOrder"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:layout_marginRight="@dimen/dp_16.7"
android:src="@drawable/set_switch_start" />
</RelativeLayout>
<TextView style="@style/line" />
<RelativeLayout
android:id="@+id/set_clear_huancun" android:id="@+id/set_clear_huancun"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="54dp" android:layout_height="54dp"
...@@ -243,6 +271,32 @@ ...@@ -243,6 +271,32 @@
<TextView style="@style/line" /> <TextView style="@style/line" />
<RelativeLayout
android:id="@+id/logoutRl"
android:layout_width="match_parent"
android:layout_height="54dp"
android:background="@color/cl_white">
<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" />
<Button <Button
android:id="@+id/exit_button" android:id="@+id/exit_button"
android:layout_width="match_parent" android:layout_width="match_parent"
......
baseSDK/src/main/java/com/dayu/common/Constants.java
...@@ -47,7 +47,7 @@ public class Constants { ...@@ -47,7 +47,7 @@ public class Constants {
*/ */
// public static String ENVIROMENT = "debug"; // public static String ENVIROMENT = "debug";
// public static String PHOTO = "dev"; // public static String PHOTO = "dev";
// public static final int LOG_LEVEL = LogUtils.LEVEL_ALL; // public static 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";
...@@ -56,7 +56,7 @@ public class Constants { ...@@ -56,7 +56,7 @@ public class Constants {
// 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=dev/sp/mobile/android/business/checkApply"; // public static final String UP_PHOTO = "/file/uploadMore?targetPath=dev/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 boolean IS_DEBUG = true;
// public static String VIDEO_SHARE_URL = "http://uat.kf.ai:9099/#/shareVideo?type=_type&id="; //uat 学习视频分享链接 type(课程: course 直播: live) // public static String VIDEO_SHARE_URL = "http://uat.kf.ai:9099/#/shareVideo?type=_type&id="; //uat 学习视频分享链接 type(课程: course 直播: live)
// public static int XLR_PID = 239; //小绿人商家id // public static int XLR_PID = 239; //小绿人商家id
// public static String SCHEME_9099 = "http://dev.kf.ai:9099/#/"; // public static String SCHEME_9099 = "http://dev.kf.ai:9099/#/";
...@@ -96,7 +96,7 @@ public class Constants { ...@@ -96,7 +96,7 @@ public class Constants {
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 boolean IS_DEBUG = false;
public static String VIDEO_SHARE_URL = "http://app.dl.kf.ai/ext/#/shareVideo?type=_type&id="; //学习视频分享链接 type(课程: course 直播: live) public static String VIDEO_SHARE_URL = "http://app.dl.kf.ai/ext/#/shareVideo?type=_type&id="; //学习视频分享链接 type(课程: course 直播: live)
public static int XLR_PID = 1936; //小绿人商家id public static int XLR_PID = 1936; //小绿人商家id
public static String SCHEME_9099 = "http://app.dl.kf.ai/ext/#/"; public static String SCHEME_9099 = "http://app.dl.kf.ai/ext/#/";
......
baseSDK/src/main/java/com/dayu/event/UserInfo.java
...@@ -40,6 +40,15 @@ public class UserInfo { ...@@ -40,6 +40,15 @@ public class UserInfo {
private String identity; //身份证号 private String identity; //身份证号
private String teamId; //队伍id private String teamId; //队伍id
private String weChatGroup; //微信群链接. private String weChatGroup; //微信群链接.
private int workStatus;
public int getWorkStatus() {
return workStatus;
}
public void setWorkStatus(int workStatus) {
this.workStatus = workStatus;
}
public String getWeChatGroup() { public String getWeChatGroup() {
return weChatGroup; return weChatGroup;
......
baseSDK/src/main/java/com/dayu/utils/AppUtils.java
...@@ -141,13 +141,20 @@ public class AppUtils { ...@@ -141,13 +141,20 @@ public class AppUtils {
public static void changeToDevEnv() { public static void changeToDevEnv() {
SPUtils.put("env", "debug"); SPUtils.put("env", "debug");
Constants.ENVIROMENT = "debug"; Constants.ENVIROMENT = "debug";
Constants.PHOTO = "dev";
Constants.LOG_LEVEL = LogUtils.LEVEL_ALL;
Constants.BASE_URL = "http://47.94.101.239:3112"; Constants.BASE_URL = "http://47.94.101.239:3112";
Constants.WEB_SOP = "http://47.94.101.239:9004/#/sop"; Constants.WEB_SOP = "http://47.94.101.239:9004/#/sop";
Constants.CHECK_MULTI_WEB_SOP = "http://47.94.101.239:9004/#/manyServiceResult"; Constants.CHECK_MULTI_WEB_SOP = "http://47.94.101.239:9004/#/manyServiceResult";
Constants.MULTI_WEB_SOP = "http://47.94.101.239:9004/#/manySop"; Constants.MULTI_WEB_SOP = "http://47.94.101.239:9004/#/manySop";
Constants.WEB_SOP_DETAIL = "http://47.94.101.239:9004/#/sopdetail"; Constants.WEB_SOP_DETAIL = "http://47.94.101.239:9004/#/sopdetail";
Constants.WEB_ZHI_SHI = "http://47.94.101.239:9004/#/detail"; Constants.WEB_ZHI_SHI = "http://47.94.101.239:9004/#/detail";
Constants.XLR_PID = 239; // Constants.UP_PHOTO = "/file/uploadMore?targetPath=dev/sp/mobile/android/business/checkApply";
// Constants.UP_VIDEO = "/file/uploadVideoOne?targetPath=dev/video";
Constants.IS_DEBUG = true;
Constants.VIDEO_SHARE_URL = "http://uat.kf.ai:9099/#/shareVideo?type=_type&id="; //uat 学习视频分享链接 type(课程: course 直播: live)
Constants.XLR_PID = 239; //小绿人商家id
Constants.SCHEME_9099 = "http://dev.kf.ai:9099/#/";
} }
...@@ -157,13 +164,20 @@ public class AppUtils { ...@@ -157,13 +164,20 @@ public class AppUtils {
public static void changeToUatEnv() { public static void changeToUatEnv() {
SPUtils.put("env", "uat"); SPUtils.put("env", "uat");
Constants.ENVIROMENT = "uat"; Constants.ENVIROMENT = "uat";
Constants.PHOTO = "test";
Constants.LOG_LEVEL = LogUtils.LEVEL_ALL;
Constants.BASE_URL = "http://47.95.223.6:3112"; Constants.BASE_URL = "http://47.95.223.6:3112";
Constants.WEB_SOP = "http://47.95.223.6:9004/#/sop"; Constants.WEB_SOP = "http://47.95.223.6:9004/#/sop";
Constants.WEB_SOP_DETAIL = "http://47.95.223.6:9004/#/sopdetail"; Constants.WEB_SOP_DETAIL = "http://47.95.223.6:9004/#/sopdetail";
Constants.WEB_ZHI_SHI = "http://47.95.223.6:9004/#/detail"; Constants.WEB_ZHI_SHI = "http://47.95.223.6:9004/#/detail";
Constants.CHECK_MULTI_WEB_SOP = "http://47.95.223.6:9004/#/manyServiceResult"; Constants.CHECK_MULTI_WEB_SOP = "http://47.95.223.6:9004/#/manyServiceResult";
Constants.MULTI_WEB_SOP = "http://47.95.223.6:9004/#/manySop"; Constants.MULTI_WEB_SOP = "http://47.95.223.6:9004/#/manySop";
Constants.XLR_PID = 14; // Constants.UP_PHOTO = "/file/uploadMore?targetPath=test/sp/mobile/android/business/checkApply";
// Constants.UP_VIDEO = "/file/uploadVideoOne?targetPath=test/video";
Constants.IS_DEBUG = true;
Constants.VIDEO_SHARE_URL = "http://uat.kf.ai:9099/#/shareVideo?type=_type&id="; //uat 学习视频分享链接 type(课程: course 直播: live)
Constants.XLR_PID = 14; //小绿人商家id
Constants.SCHEME_9099 = "http://uat.kf.ai:9099/#/";
} }
...@@ -173,13 +187,21 @@ public class AppUtils { ...@@ -173,13 +187,21 @@ public class AppUtils {
public static void changeToReleaseEnv() { public static void changeToReleaseEnv() {
SPUtils.put("env", "release"); SPUtils.put("env", "release");
Constants.ENVIROMENT = "release"; Constants.ENVIROMENT = "release";
Constants.ENVIROMENT = "release";
Constants.PHOTO = "online";
Constants.LOG_LEVEL = LogUtils.LEVEL_OFF;
Constants.BASE_URL = "https://mobile.kf.ai"; Constants.BASE_URL = "https://mobile.kf.ai";
Constants.WEB_SOP = "https://sop.kf.ai/#/sop"; Constants.WEB_SOP = "https://sop.kf.ai/#/sop";
Constants.WEB_SOP_DETAIL = "https://sop.kf.ai/#/sopdetail"; Constants.WEB_SOP_DETAIL = "https://sop.kf.ai/#/sopdetail";
Constants.WEB_ZHI_SHI = "https://sop.kf.ai/#/detail"; Constants.WEB_ZHI_SHI = "https://sop.kf.ai/#/detail";
Constants.CHECK_MULTI_WEB_SOP = "https://sop.kf.ai/#/manyServiceResult"; Constants.CHECK_MULTI_WEB_SOP = "https://sop.kf.ai/#/manyServiceResult";
Constants.MULTI_WEB_SOP = "https://sop.kf.ai/#/manySop"; Constants.MULTI_WEB_SOP = "https://sop.kf.ai/#/manySop";
Constants.XLR_PID = 1936; // Constants.UP_PHOTO = "/file/uploadMore?targetPath=online/sp/mobile/android/business/checkApply";
// Constants.UP_VIDEO = "/file/uploadVideoOne?targetPath=online/video";
Constants.IS_DEBUG = true;
Constants.VIDEO_SHARE_URL = "http://app.dl.kf.ai/ext/#/shareVideo?type=_type&id="; //学习视频分享链接 type(课程: course 直播: live)
Constants.XLR_PID = 1936; //小绿人商家id
Constants.SCHEME_9099 = "http://app.dl.kf.ai/ext/#/";
} }
......
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 = 19 ext.min_sdk_version = 19
ext.target_sdk_version = 26 ext.target_sdk_version = 26
ext.version_code = 301 ext.version_code = 302
ext.verson_name = "3.0.1" ext.verson_name = "3.0.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
...@@ -15,13 +15,13 @@ buildscript { ...@@ -15,13 +15,13 @@ buildscript {
// ext.kotlin_version = '1.2.50' // ext.kotlin_version = '1.2.50'
repositories { repositories {
google()
maven { url 'https://dl.google.com/dl/android/maven2/' }
mavenCentral() mavenCentral()
maven { url 'https://jitpack.io' } maven { url 'https://jitpack.io' }
maven { url 'https://maven.google.com' }
maven{ url 'http://maven.aliyun.com/nexus/content/groups/public/'} maven{ url 'http://maven.aliyun.com/nexus/content/groups/public/'}
maven { url 'https://dl.bintray.com/umsdk/release' } maven { url 'https://dl.bintray.com/umsdk/release' }
google()
} }
dependencies { dependencies {
classpath "com.android.tools.build:gradle:$gradle_version" classpath "com.android.tools.build:gradle:$gradle_version"
...@@ -32,13 +32,13 @@ buildscript { ...@@ -32,13 +32,13 @@ buildscript {
allprojects { allprojects {
repositories { repositories {
google()
maven { url 'https://dl.google.com/dl/android/maven2/' }
mavenCentral() mavenCentral()
maven { url 'https://jitpack.io' } maven { url 'https://jitpack.io' }
maven { url 'https://maven.google.com' }
maven{ url 'http://maven.aliyun.com/nexus/content/groups/public/'} maven{ url 'http://maven.aliyun.com/nexus/content/groups/public/'}
maven { url 'https://dl.bintray.com/umsdk/release' } maven { url 'https://dl.bintray.com/umsdk/release' }
google()
} }
} }
......
userCenter/src/main/java/com/dayu/usercenter/ui/activity2/BusinessTypeActivity.java
...@@ -272,6 +272,10 @@ public class BusinessTypeActivity extends BaseActivity<SImplePresenter, Activity ...@@ -272,6 +272,10 @@ public class BusinessTypeActivity extends BaseActivity<SImplePresenter, Activity
} }
}); });
mBind.city.setOnClickListener(view -> { mBind.city.setOnClickListener(view -> {
if (TextUtils.isEmpty(provinceName)){
ToastUtils.showShortToast("请先选择省");
return;
}
if (cityList.size() > 0) { if (cityList.size() > 0) {
showAddrDialog(2, cityList); showAddrDialog(2, cityList);
} else { } else {
...@@ -279,6 +283,10 @@ public class BusinessTypeActivity extends BaseActivity<SImplePresenter, Activity ...@@ -279,6 +283,10 @@ public class BusinessTypeActivity extends BaseActivity<SImplePresenter, Activity
} }
}); });
mBind.area.setOnClickListener(view -> { mBind.area.setOnClickListener(view -> {
if (TextUtils.isEmpty(provinceName) || TextUtils.isEmpty(cityName)){
ToastUtils.showShortToast("请先选择省市");
return;
}
if (areaList.size() > 0) { if (areaList.size() > 0) {
showAddrDialog(3, areaList); showAddrDialog(3, areaList);
} else { } else {
......
userCenter/src/main/java/com/dayu/usercenter/ui/activity2/ServerRegisterActivity.java
package com.dayu.usercenter.ui.activity2; package com.dayu.usercenter.ui.activity2;
import android.Manifest; import android.Manifest;
import android.content.Intent;
import android.net.Uri;
import android.support.v7.widget.GridLayoutManager; import android.support.v7.widget.GridLayoutManager;
import android.text.TextUtils; import android.text.TextUtils;
import android.util.ArrayMap; import android.util.ArrayMap;
...@@ -17,17 +15,13 @@ import com.chad.library.adapter.base.BaseQuickAdapter; ...@@ -17,17 +15,13 @@ import com.chad.library.adapter.base.BaseQuickAdapter;
import com.chad.library.adapter.base.BaseViewHolder; import com.chad.library.adapter.base.BaseViewHolder;
import com.dayu.base.api.APIService; import com.dayu.base.api.APIService;
import com.dayu.base.api.Api; import com.dayu.base.api.Api;
import com.dayu.base.api.BaseApiFactory;
import com.dayu.base.api.protocol.TreeAddressBean; import com.dayu.base.api.protocol.TreeAddressBean;
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.common.Constants; import com.dayu.common.Constants;
import com.dayu.provider.event.CertificationEvent;
import com.dayu.provider.event.RefreshEvent;
import com.dayu.provider.router.RouterPath; import com.dayu.provider.router.RouterPath;
import com.dayu.usercenter.R; import com.dayu.usercenter.R;
import com.dayu.usercenter.api.UserService2; import com.dayu.usercenter.api.UserService2;
import com.dayu.usercenter.databinding.ActivityRegisterVerifyBinding;
import com.dayu.usercenter.databinding.ActivityServerRegisterVerifyBinding; import com.dayu.usercenter.databinding.ActivityServerRegisterVerifyBinding;
import com.dayu.usercenter.model.SaveSceneData; import com.dayu.usercenter.model.SaveSceneData;
import com.dayu.usercenter.model.bean.BusinessSceneBean; import com.dayu.usercenter.model.bean.BusinessSceneBean;
...@@ -35,17 +29,11 @@ import com.dayu.usercenter.model.bean.ServiceBean; ...@@ -35,17 +29,11 @@ import com.dayu.usercenter.model.bean.ServiceBean;
import com.dayu.usercenter.model.bean.ServiceSaveBean; import com.dayu.usercenter.model.bean.ServiceSaveBean;
import com.dayu.usercenter.model.bean.ServiceTypeBean; import com.dayu.usercenter.model.bean.ServiceTypeBean;
import com.dayu.utils.CommonUtils; import com.dayu.utils.CommonUtils;
import com.dayu.utils.GlideImageLoader;
import com.dayu.utils.SelectPicUtils;
import com.dayu.utils.ToastUtils; import com.dayu.utils.ToastUtils;
import com.dayu.widgets.CustomDialog; import com.dayu.widgets.CustomDialog;
import com.dayu.widgets.WheelDialog; import com.dayu.widgets.WheelDialog;
import com.luck.picture.lib.PictureSelector;
import com.luck.picture.lib.entity.LocalMedia;
import com.tbruyelle.rxpermissions2.RxPermissions; import com.tbruyelle.rxpermissions2.RxPermissions;
import org.greenrobot.eventbus.EventBus;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.regex.Matcher; import java.util.regex.Matcher;
...@@ -293,6 +281,10 @@ public class ServerRegisterActivity extends BaseActivity<SImplePresenter, Activi ...@@ -293,6 +281,10 @@ public class ServerRegisterActivity extends BaseActivity<SImplePresenter, Activi
} }
}); });
mBind.city.setOnClickListener(view -> { mBind.city.setOnClickListener(view -> {
if (TextUtils.isEmpty(provinceName)){
ToastUtils.showShortToast("请先选择省");
return;
}
if (cityList.size() > 0) { if (cityList.size() > 0) {
showAddrDialog(2, cityList); showAddrDialog(2, cityList);
} else { } else {
...@@ -300,6 +292,10 @@ public class ServerRegisterActivity extends BaseActivity<SImplePresenter, Activi ...@@ -300,6 +292,10 @@ public class ServerRegisterActivity extends BaseActivity<SImplePresenter, Activi
} }
}); });
mBind.area.setOnClickListener(view -> { mBind.area.setOnClickListener(view -> {
if (TextUtils.isEmpty(provinceName) || TextUtils.isEmpty(cityName)){
ToastUtils.showShortToast("请先选择省市");
return;
}
if (areaList.size() > 0) { if (areaList.size() > 0) {
showAddrDialog(3, areaList); showAddrDialog(3, areaList);
} else { } else {
......
userCenter/src/main/java/com/dayu/usercenter/ui/fragment/HomeUserFragment.java
package com.dayu.usercenter.ui.fragment; package com.dayu.usercenter.ui.fragment;
import android.Manifest;
import android.content.ClipData;
import android.content.ClipboardManager;
import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.LinearLayoutManager;
...@@ -15,6 +11,7 @@ import com.alibaba.android.arouter.launcher.ARouter; ...@@ -15,6 +11,7 @@ import com.alibaba.android.arouter.launcher.ARouter;
import com.dayu.base.api.APIService; import com.dayu.base.api.APIService;
import com.dayu.base.api.Api; import com.dayu.base.api.Api;
import com.dayu.base.api.protocol.AddressInfoBean; import com.dayu.base.api.protocol.AddressInfoBean;
import com.dayu.base.api.protocol.TreeAddressBean;
import com.dayu.base.ui.fragment.BaseFragment; import com.dayu.base.ui.fragment.BaseFragment;
import com.dayu.common.Constants; import com.dayu.common.Constants;
import com.dayu.event.Notice; import com.dayu.event.Notice;
...@@ -56,7 +53,7 @@ import com.dayu.utils.UserManager; ...@@ -56,7 +53,7 @@ import com.dayu.utils.UserManager;
import com.dayu.widgets.CustomDialog; import com.dayu.widgets.CustomDialog;
import com.dayu.widgets.RegisterDialog; import com.dayu.widgets.RegisterDialog;
import com.dayu.widgets.WechatShareDialog; import com.dayu.widgets.WechatShareDialog;
import com.tbruyelle.rxpermissions2.RxPermissions; import com.dayu.widgets.WheelDialog;
import com.umeng.socialize.bean.SHARE_MEDIA; import com.umeng.socialize.bean.SHARE_MEDIA;
import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.EventBus;
...@@ -66,11 +63,6 @@ import org.greenrobot.eventbus.ThreadMode; ...@@ -66,11 +63,6 @@ import org.greenrobot.eventbus.ThreadMode;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import io.reactivex.disposables.Disposable;
import com.dayu.base.api.protocol.TreeAddressBean;
import com.dayu.widgets.WheelDialog;
/** /**
* Created by luofan * Created by luofan
* on 2017/11/20. * on 2017/11/20.
...@@ -557,6 +549,10 @@ public class HomeUserFragment extends BaseFragment<HomeUserPresenter, FragmentHo ...@@ -557,6 +549,10 @@ public class HomeUserFragment extends BaseFragment<HomeUserPresenter, FragmentHo
} }
}); });
mBind.city.setOnClickListener(view -> { mBind.city.setOnClickListener(view -> {
if (TextUtils.isEmpty(provinceName)){
ToastUtils.showShortToast("请先选择省");
return;
}
if (cityList.size() > 0) { if (cityList.size() > 0) {
showAddrDialog(2, cityList); showAddrDialog(2, cityList);
} else { } else {
...@@ -564,6 +560,10 @@ public class HomeUserFragment extends BaseFragment<HomeUserPresenter, FragmentHo ...@@ -564,6 +560,10 @@ public class HomeUserFragment extends BaseFragment<HomeUserPresenter, FragmentHo
} }
}); });
mBind.area.setOnClickListener(view -> { mBind.area.setOnClickListener(view -> {
if (TextUtils.isEmpty(provinceName) || TextUtils.isEmpty(cityName)){
ToastUtils.showShortToast("请先选择省市");
return;
}
if (areaList.size() > 0) { if (areaList.size() > 0) {
showAddrDialog(3, areaList); showAddrDialog(3, areaList);
} else { } else {
......
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