gaojian/xz_cultural
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

接口修改

Browse Source
This commit is contained in:
itgaojian163 2022-11-01 17:27:24 +08:00
parent 7c1e6c789e
commit d58eb5782a
23 changed files with 182 additions and 258 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.idea/misc.xml
View File

@ -8,6 +8,8 @@
<component name="DesignSurface">
<option name="filePathToZoomLevelMap">
<map>
<entry key="moduleactivity/src/main/res/layout/activity_detail.xml" value="0.3591485507246377" />
<entry key="modulemain/src/main/res/layout/activity_choose_city.xml" value="0.2504528985507246" />
<entry key="moduleplace/src/main/res/layout/activity_place_detail.xml" value="0.2504528985507246" />
</map>
</option>

3
cm_utils/src/main/java/com/sucstepsoft/cm_utils/constant/PathConfig.java
View File

@ -42,7 +42,8 @@ public class PathConfig {
public static final String USER_TYPE_P = "e483f019-d971-49ac-b5fa-3314220da703";
public static final String USER_TYPE_N = "bc405346-8714-4ded-89ac-9cc4d755f66a";
public static final String USER_TYPE_X = "25affe67-134c-4a32-ba41-64b0cfedc782";
public static final String APP_VERSION_ID = "f5935aa1-4405-4cbe-85bc-d7c1a8ddc9c4";
// public static final String APP_VERSION_ID = "f5935aa1-4405-4cbe-85bc-d7c1a8ddc9c4";
public static final String APP_VERSION_ID = "10e53e1e-2c21-4b5d-b81f-b514abece994";//测试
public static final String NEWS_ID = "f497904b-7727-4832-891c-604c36ae4167";//文化动态ID
public static final String NEWS_SHOW_ID = "f1d5d313-f728-4dda-9843-1116d97e17b0";//展览展示ID

97
cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/beans/BaseDictionaryBean.java
View File

@ -12,81 +12,71 @@ import java.util.List;
* 描述: 基础字典Bean
*/
public class BaseDictionaryBean implements IPickerViewData {
/**
* dictionaryCode : string
* dictionaryId : string
* dictionaryName : string
* dictionaryParentId : string
* dictionaryParentName : string
* dictionarySort : string
* dictionarySummary : string
* parent : true
* subDictionary : [{}]
*/
private String dictionaryCode;
private String dictionaryId;
private String dictionaryName;
private String dictionaryParentId;
private String dictionaryParentName;
private String dictionarySort;
private String dictionarySummary;
private String dataCode;
private String dataId;
private String dataName;
private String dataParentId;
private String dataParentName;
private String dataSort;
private String dataSummary;
private boolean parent;
private List<SubDictionaryBean> subDictionary;
public String getDictionaryCode() {
return dictionaryCode;
private List<?> subData;
public String getDataCode() {
return dataCode;
}
public void setDictionaryCode(String dictionaryCode) {
this.dictionaryCode = dictionaryCode;
public void setDataCode(String dataCode) {
this.dataCode = dataCode;
}
public String getDictionaryId() {
return dictionaryId;
public String getDataId() {
return dataId;
}
public void setDictionaryId(String dictionaryId) {
this.dictionaryId = dictionaryId;
public void setDataId(String dataId) {
this.dataId = dataId;
}
public String getDictionaryName() {
return dictionaryName;
public String getDataName() {
return dataName;
}
public void setDictionaryName(String dictionaryName) {
this.dictionaryName = dictionaryName;
public void setDataName(String dataName) {
this.dataName = dataName;
}
public String getDictionaryParentId() {
return dictionaryParentId;
public String getDataParentId() {
return dataParentId;
}
public void setDictionaryParentId(String dictionaryParentId) {
this.dictionaryParentId = dictionaryParentId;
public void setDataParentId(String dataParentId) {
this.dataParentId = dataParentId;
}
public String getDictionaryParentName() {
return dictionaryParentName;
public String getDataParentName() {
return dataParentName;
}
public void setDictionaryParentName(String dictionaryParentName) {
this.dictionaryParentName = dictionaryParentName;
public void setDataParentName(String dataParentName) {
this.dataParentName = dataParentName;
}
public String getDictionarySort() {
return dictionarySort;
public String getDataSort() {
return dataSort;
}
public void setDictionarySort(String dictionarySort) {
this.dictionarySort = dictionarySort;
public void setDataSort(String dataSort) {
this.dataSort = dataSort;
}
public String getDictionarySummary() {
return dictionarySummary;
public String getDataSummary() {
return dataSummary;
}
public void setDictionarySummary(String dictionarySummary) {
this.dictionarySummary = dictionarySummary;
public void setDataSummary(String dataSummary) {
this.dataSummary = dataSummary;
}
public boolean isParent() {
@ -97,19 +87,16 @@ public class BaseDictionaryBean implements IPickerViewData {
this.parent = parent;
}
public List<SubDictionaryBean> getSubDictionary() {
return subDictionary;
public List<?> getSubData() {
return subData;
}
public void setSubDictionary(List<SubDictionaryBean> subDictionary) {
this.subDictionary = subDictionary;
public void setSubData(List<?> subData) {
this.subData = subData;
}
@Override
public String getPickerViewText() {
return getDictionaryName();
}
public static class SubDictionaryBean {
return dataName;
}
}

16
cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/retrofit_net/BaseUrlApi.java
View File

@ -77,15 +77,15 @@ public class BaseUrlApi {
public static final String BASE_NEWS_DETAIL = BASE_SYSTEM_IP;//新闻
// public static final String BASE_IMG_URL = BASE_IP + "route/file/downloadfile/true/";
// GET /app/appversion/downloadapp/{appVersionId}
public static final String APP_DOWNLOAD_URL = BASE_URL + "app/appversion/downloadapp/" + PathConfig.APP_VERSION_ID;
public static final String APP_DOWNLOAD_URL = BASE_URL + "app/appversion/download/" + PathConfig.APP_VERSION_ID;
public static final String BASE_ACTIVITY_IMG_URL = BASE_ACTIVIY_IP + "route/file/downloadfile/true/";
public static final String BASE_VOLUNTEER_IMG_URL = BASE_VOLUNTEER_IP + "route/file/downloadfile/true/";
public static final String BASE_NEWS_IMG_URL = BASE_NEWS_IP + "route/file/downloadfile/true/";
public static final String BASE_LIVE_IMG_IP = BASE_LIVE_IP + "route/file/downloadfile/true/";
public static final String BASE_IMG_URL = IP + "route/file/downloadfile/true/";
public static final String BASE_LEGACY_IMG_URL = BASE_LEGACY_IP + "route/file/downloadfile/true/";
public static final String BASE_SOCIAL_IMG_URL = BASE_CULTURAL_SHARE + "route/file/downloadfile/true/";
public static final String BASE_ACTIVITY_IMG_URL = BASE_ACTIVIY_IP + "route/file/download/true/";
public static final String BASE_VOLUNTEER_IMG_URL = BASE_VOLUNTEER_IP + "route/file/download/true/";
public static final String BASE_NEWS_IMG_URL = BASE_NEWS_IP + "route/file/download/true/";
public static final String BASE_LIVE_IMG_IP = BASE_LIVE_IP + "route/file/download/true/";
public static final String BASE_IMG_URL = IP + "route/file/download/true/";
public static final String BASE_LEGACY_IMG_URL = BASE_LEGACY_IP + "route/file/download/true/";
public static final String BASE_SOCIAL_IMG_URL = BASE_CULTURAL_SHARE + "route/file/download/true/";
public static final String APK_DOWNLOAD_URL = "downloadUrl";
public static final String UPDATE_URL = "version.json";

14
cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/retrofit_net/api/BaseApiService.java
View File

@ -181,8 +181,8 @@ public interface BaseApiService {
* @return
*/
@Headers({"base_url_name:volunteer", "Content-Type:application/json", "Accept:application/json"})
@GET("app/datadictionary/listdictionarybyparentid/{dictionaryParentId}")
Observable<List<BaseDictionaryBean>> getDicList(@Path("dictionaryParentId") String id, @Header("token") String token);
@GET("app/data/listbyparentid/{dataParentId}")
Observable<List<BaseDictionaryBean>> getDicList(@Path("dataParentId") String id, @Header("token") String token);
/**
* 获取字典
@ -191,8 +191,8 @@ public interface BaseApiService {
* @return
*/
@Headers({"Content-Type:application/json", "Accept:application/json"})
@GET("app/datadictionary/listdictionarybyparentid/{dictionaryParentId}")
Observable<List<BaseDictionaryBean>> getSystemDictionary(@Path("dictionaryParentId") String id, @Header("token") String token);
@GET("app/data/listbyparentid/{dataParentId}")
Observable<List<BaseDictionaryBean>> getSystemDictionary(@Path("dataParentId") String id, @Header("token") String token);
/**
* 用户注册
@ -206,7 +206,7 @@ public interface BaseApiService {
* 获取验证码
*/
@Headers({"Content-Type:application/json", "Accept:application/json"})
@GET("api/sms/getverificationcode/{phone}")
@GET("app/sms/verify-code/{phone}")
Observable<BaseSuccessBean> getVerifyCodeBean(@Path("phone") String phone);
/**
@ -228,11 +228,11 @@ public interface BaseApiService {
*/
// getInfoField();
@Headers({"Content-Type:application/json", "Accept:application/json"})
@GET("app/user/getuserinfo")
@GET("app/user/get-app-user")
Observable<JsonObject> getBaseUserInfo(@Header("token") String token);
@Headers({"Content-Type:application/json", "Accept:application/json"})
@GET("app/user/getappuser")
@GET("app/user/get-app-user")
Observable<BaseUserInfo> getUserInfo(@Header("token") String token);
/**

9
cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/retrofit_net/bean/BaseUserInfo.java
View File

@ -8,15 +8,6 @@ package com.sucstepsoft.cm_utils.core.retrofit_net.bean;
*/
public class BaseUserInfo {
/**
* avatar : string
* email : string
* name : string
* phone : string
* userId : string
* username : string
*/
private String avatar;
private String email;
private String name;

5
moduleactivity/src/main/java/com/tengshisoft/moduleactivity/activity/ActivityDetailActivity.java
View File

@ -12,6 +12,8 @@ import android.widget.LinearLayout;
import android.widget.RelativeLayout;
import android.widget.TextView;
import androidx.annotation.Nullable;
import com.alibaba.android.arouter.facade.annotation.Route;
import com.alibaba.android.arouter.launcher.ARouter;
import com.gyf.immersionbar.ImmersionBar;
@ -25,6 +27,7 @@ import com.sucstepsoft.cm_utils.core.widget.base.BaseBannerImageAdapter;
import com.sucstepsoft.cm_utils.core.widget.views.TypeFaceTextView;
import com.sucstepsoft.cm_utils.utils.ConvertUtils;
import com.sucstepsoft.cm_utils.utils.ExceptionHandler;
import com.sucstepsoft.cm_utils.utils.LogUtils;
import com.sucstepsoft.cm_utils.utils.ToastUtils;
import com.sucstepsoft.cm_utils.utils.UIUtil;
import com.sucstepsoft.cm_utils.utils.UserLgUtils;
@ -49,7 +52,6 @@ import com.youth.banner.util.BannerUtils;
import java.util.ArrayList;
import java.util.List;
import androidx.annotation.Nullable;
import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.Unbinder;
@ -377,6 +379,7 @@ public class ActivityDetailActivity extends BaseActivity {
mBanner.setPageTransformer(new DepthPageTransformer());
mBanner.start();
}
LogUtils.e(bean.getEnrollCount() + "===" + bean.getActivityUserNum() + "====" + bean.getActivityState());
if (bean.getEnrollCount() < bean.getActivityUserNum()) {
mLlBtnContent.setVisibility(View.VISIBLE);
if ("3".equals(bean.getActivityState())) {

6
moduleactivity/src/main/java/com/tengshisoft/moduleactivity/fragments/ActivityMainFragment.java
View File

@ -142,13 +142,13 @@ public class ActivityMainFragment extends BaseFragment {
BaseDictionaryBean bean = baseDictionaryBeans.get(i);
View view = View.inflate(mActivity, R.layout.item_tab_custom_view, null);
TypeFaceTextView textView = view.findViewById(R.id.tv_tab_title);
textView.setText(bean.getDictionaryName());
textView.setText(bean.getDataName());
TabLayout.Tab tab = mTlType.newTab();
tab.setTag(bean);
tab.setCustomView(view);
mTlType.addTab(tab);
}
mCurrentType = baseDictionaryBeans.get(0).getDictionaryId();
mCurrentType = baseDictionaryBeans.get(0).getDataId();
mTlType.setTabIndicatorFullWidth(false);
mTlType.addOnTabSelectedListener(new TabLayout.OnTabSelectedListener() {
@Override
@ -160,7 +160,7 @@ public class ActivityMainFragment extends BaseFragment {
TextView tvTab = tabView.findViewById(R.id.tv_tab_title);
tvTab.setTextColor(Color.RED);
BaseDictionaryBean bean = (BaseDictionaryBean) tab.getTag();
mCurrentType = bean.getDictionaryId();
mCurrentType = bean.getDataId();
mCurrentPageNo = 1;
mTotalSize = 0;
getActivityListDataByType(mCurrentPageNo);

2
moduleactivity/src/main/java/com/tengshisoft/moduleactivity/net/ApiActivity.java
View File

@ -104,6 +104,6 @@ public interface ApiActivity {
* @return
*/
@Headers({"base_url_name:activity", "Content-Type:application/json", "Accept:application/json"})
@GET("app/activityuserapply/saveSmsCoderelease/{phone}")
@GET("app/sms/verify-code/{phone}")
Observable<BaseSuccessBean> getVerifyCode(@Path("phone") String phone);
}

7
modulecultural/src/main/java/com/tengshisoft/modulecultural/activitys/CulturalLegacyActivity.java
View File

@ -1,18 +1,19 @@
package com.tengshisoft.modulecultural.activitys;
import android.graphics.Color;
import android.os.Bundle;
import android.view.View;
import android.widget.ImageView;
import android.widget.ProgressBar;
import android.widget.TextView;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import com.alibaba.android.arouter.facade.annotation.Route;
import com.alibaba.android.arouter.launcher.ARouter;
import com.google.android.material.tabs.TabLayout;
import com.scwang.smartrefresh.layout.SmartRefreshLayout;
import com.sucstepsoft.cm_utils.constant.PathConfig;
import com.sucstepsoft.cm_utils.core.beans.BaseDictionaryBean;
import com.sucstepsoft.cm_utils.core.retrofit_net.RetrofitManager;
import com.sucstepsoft.cm_utils.core.widget.base.BaseActivity;
import com.sucstepsoft.cm_utils.core.widget.views.TypeFaceTextView;
@ -28,8 +29,6 @@ import com.tengshisoft.modulecultural.net.CulturalApi;
import java.util.ArrayList;
import java.util.List;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.Unbinder;

4
modulecultural/src/main/java/com/tengshisoft/modulecultural/activitys/RegisterVolunteerSingleActivity.java
View File

@ -459,8 +459,8 @@ public class RegisterVolunteerSingleActivity extends BaseActivity {
hideSoftKeyboard();
if (mVocationList != null && mVocationList.size() > 0) {
mVocationPicker = new OptionsPickerBuilder(RegisterVolunteerSingleActivity.this, (option1, p2, p3, v) -> {
mVocationId = mVocationList.get(option1).getDictionaryId();
mTvVocationContent.setText(mVocationList.get(option1).getDictionaryName());
mVocationId = mVocationList.get(option1).getDataId();
mTvVocationContent.setText(mVocationList.get(option1).getDataName());
}).setTitleText("请选择")
.setCancelColor(Color.parseColor("#1189FF"))
.setSubmitColor(Color.parseColor("#1189FF"))

29
modulecultural/src/main/java/com/tengshisoft/modulecultural/activitys/TeamEditActivity.java
View File

@ -1,30 +1,17 @@
package com.tengshisoft.modulecultural.activitys;
import androidx.annotation.Nullable;
import androidx.appcompat.app.AppCompatActivity;
import androidx.recyclerview.widget.RecyclerView;
import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.Unbinder;
import io.reactivex.Observer;
import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.disposables.Disposable;
import io.reactivex.schedulers.Schedulers;
import okhttp3.RequestBody;
import android.app.ProgressDialog;
import android.content.Intent;
import android.graphics.Color;
import android.os.Bundle;
import android.text.TextUtils;
import android.widget.Button;
import android.widget.EditText;
import android.widget.TextView;
import androidx.annotation.Nullable;
import androidx.recyclerview.widget.RecyclerView;
import com.alibaba.android.arouter.facade.annotation.Route;
import com.alibaba.android.arouter.launcher.ARouter;
import com.baidu.mapapi.map.TextureMapView;
import com.bigkoo.pickerview.builder.OptionsPickerBuilder;
import com.bigkoo.pickerview.view.OptionsPickerView;
import com.google.gson.Gson;
import com.sucstepsoft.cm_utils.constant.PathConfig;
@ -40,7 +27,6 @@ import com.sucstepsoft.cm_utils.utils.UIUtil;
import com.sucstepsoft.cm_utils.utils.UserLgUtils;
import com.tengshisoft.modulecultural.R;
import com.tengshisoft.modulecultural.R2;
import com.tengshisoft.modulecultural.adapter.MemberChooseAdapter;
import com.tengshisoft.modulecultural.bean.MemberBean;
import com.tengshisoft.modulecultural.bean.TeamBody;
import com.tengshisoft.modulecultural.bean.TeamDetailBean;
@ -49,6 +35,15 @@ import com.tengshisoft.modulecultural.net.CulturalApi;
import java.util.ArrayList;
import java.util.List;
import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.Unbinder;
import io.reactivex.Observer;
import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.disposables.Disposable;
import io.reactivex.schedulers.Schedulers;
import okhttp3.RequestBody;
/**
* 编辑我的团队
*/

13
modulecultural/src/main/java/com/tengshisoft/modulecultural/activitys/VolunteerPublishActivity.java
View File

@ -5,7 +5,6 @@ import android.content.Intent;
import android.database.Cursor;
import android.net.Uri;
import android.os.Build;
import android.os.Bundle;
import android.os.Environment;
import android.provider.MediaStore;
import android.text.TextUtils;
@ -17,6 +16,10 @@ import android.widget.RadioButton;
import android.widget.RadioGroup;
import android.widget.TextView;
import androidx.core.content.FileProvider;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import com.alibaba.android.arouter.facade.annotation.Route;
import com.alibaba.android.arouter.launcher.ARouter;
import com.bigkoo.pickerview.builder.TimePickerBuilder;
@ -26,16 +29,13 @@ import com.sucstepsoft.cm_utils.constant.PathConfig;
import com.sucstepsoft.cm_utils.constant.PermissionConstants;
import com.sucstepsoft.cm_utils.core.beans.AddPhotoBean;
import com.sucstepsoft.cm_utils.core.beans.BaseSuccessBean;
import com.sucstepsoft.cm_utils.core.beans.UserLoginBean;
import com.sucstepsoft.cm_utils.core.retrofit_net.BaseUrlApi;
import com.sucstepsoft.cm_utils.core.retrofit_net.RetrofitManager;
import com.sucstepsoft.cm_utils.core.retrofit_net.api.BaseApiService;
import com.sucstepsoft.cm_utils.core.widget.base.AddPhotoAdapter;
import com.sucstepsoft.cm_utils.core.widget.base.BaseActivity;
import com.sucstepsoft.cm_utils.core.widget.base.BaseRecyclerAdapter;
import com.sucstepsoft.cm_utils.core.widget.views.ButtomDialogView;
import com.sucstepsoft.cm_utils.core.widget.views.TypeFaceTextView;
import com.sucstepsoft.cm_utils.core.widget.xtablayout.DividerDrawable;
import com.sucstepsoft.cm_utils.utils.ExceptionHandler;
import com.sucstepsoft.cm_utils.utils.LogUtils;
import com.sucstepsoft.cm_utils.utils.PermissionUtils;
@ -56,16 +56,12 @@ import java.util.ArrayList;
import java.util.Calendar;
import java.util.List;
import androidx.core.content.FileProvider;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.Unbinder;
import io.reactivex.Observer;
import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.disposables.Disposable;
import io.reactivex.internal.operators.maybe.MaybeConcatArray;
import io.reactivex.schedulers.Schedulers;
import okhttp3.MediaType;
import okhttp3.MultipartBody;
@ -392,6 +388,7 @@ public class VolunteerPublishActivity extends BaseActivity {
@Override
public void onError(Throwable e) {
dialog.dismiss();
ExceptionHandler.handleException(e);
ToastUtils.showShort("发布失败,请稍后重试");
}

12
modulecultural/src/main/java/com/tengshisoft/modulecultural/activitys/VolunteerUserInfoActivity.java
View File

@ -191,8 +191,8 @@ public class VolunteerUserInfoActivity extends BaseActivity {
String type = "";
for (int i = 0; i < split.length; i++) {
for (int j = 0; j < beans.size(); j++) {
if (split[i].equals(beans.get(j).getDictionaryId())) {
type += beans.get(j).getDictionaryName() + ",";
if (split[i].equals(beans.get(j).getDataId())) {
type += beans.get(j).getDataName() + ",";
}
}
}
@ -203,8 +203,8 @@ public class VolunteerUserInfoActivity extends BaseActivity {
String type1 = "";
for (int i = 0; i < split1.length; i++) {
for (int j = 0; j < beans.size(); j++) {
if (split1[i].equals(beans.get(j).getDictionaryId())) {
type1 += beans.get(j).getDictionaryName() + ",";
if (split1[i].equals(beans.get(j).getDataId())) {
type1 += beans.get(j).getDataName() + ",";
}
}
}
@ -213,8 +213,8 @@ public class VolunteerUserInfoActivity extends BaseActivity {
case TYPE_SERVICE_AREA:
String serviceArea = mDetalBean.getServiceArea();
for (int i = 0; i < beans.size(); i++) {
if (serviceArea.equals(beans.get(i).getDictionaryId())) {
mTvServiceAreaContent.setText(beans.get(i).getDictionaryName());
if (serviceArea.equals(beans.get(i).getDataId())) {
mTvServiceAreaContent.setText(beans.get(i).getDataName());
break;
}
}

10
modulecultural/src/main/java/com/tengshisoft/modulecultural/activitys/VolunteerUserInfoEditActivity.java
View File

@ -318,8 +318,8 @@ public class VolunteerUserInfoEditActivity extends BaseActivity {
hideSoftKeyboard();
if (mVocationList != null && mVocationList.size() > 0) {
mVocationPicker = new OptionsPickerBuilder(VolunteerUserInfoEditActivity.this, (option1, p2, p3, v) -> {
mVocationId = mVocationList.get(option1).getDictionaryId();
mTvVocationContent.setText(mVocationList.get(option1).getDictionaryName());
mVocationId = mVocationList.get(option1).getDataId();
mTvVocationContent.setText(mVocationList.get(option1).getDataName());
}).setTitleText("请选择")
.setCancelColor(Color.parseColor("#1189FF"))
.setSubmitColor(Color.parseColor("#1189FF"))
@ -421,9 +421,9 @@ public class VolunteerUserInfoEditActivity extends BaseActivity {
String serviceArea = mDetalBean.getServiceArea();
mServiceAreaList = beans;
for (int i = 0; i < beans.size(); i++) {
if (serviceArea.equals(beans.get(i).getDictionaryId())) {
mTvServiceAreaContent.setText(beans.get(i).getDictionaryName());
mServiceAreaId = beans.get(i).getDictionaryId();
if (serviceArea.equals(beans.get(i).getDataId())) {
mTvServiceAreaContent.setText(beans.get(i).getDataName());
mServiceAreaId = beans.get(i).getDataId();
break;
}
}

12
modulecultural/src/main/java/com/tengshisoft/modulecultural/adapter/ServiceTypeAdapter.java
View File

@ -49,7 +49,7 @@ public class ServiceTypeAdapter extends BaseRecyclerAdapter<BaseDictionaryBean,
public void bindHolder(ServiceTypeHolder serviceTypeHolder, int i) {
if (mCheckId != null && mCheckId.size() > 0) {
for (int j = 0; j < mCheckId.size(); j++) {
if (mCheckId.get(j).equals(mData.get(i).getDictionaryId())) {
if (mCheckId.get(j).equals(mData.get(i).getDataId())) {
serviceTypeHolder.mTvTypeName.setChecked(true);
}
}
@ -59,18 +59,18 @@ public class ServiceTypeAdapter extends BaseRecyclerAdapter<BaseDictionaryBean,
if (isChecked) {
//添加
if (mCheckId.size() > 0) {
boolean contains = mCheckId.contains(mData.get(i).getDictionaryId());
boolean contains = mCheckId.contains(mData.get(i).getDataId());
if (!contains) {
mCheckId.add(mData.get(i).getDictionaryId());
mCheckId.add(mData.get(i).getDataId());
}
} else {
mCheckId.add(mData.get(i).getDictionaryId());
mCheckId.add(mData.get(i).getDataId());
}
} else {
//删除
mCheckId.remove(mData.get(i).getDictionaryId());
mCheckId.remove(mData.get(i).getDataId());
}
});
serviceTypeHolder.mTvTypeName.setText(mData.get(i).getDictionaryName());
serviceTypeHolder.mTvTypeName.setText(mData.get(i).getDataName());
}
}

38
modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/activitys/base/LoginActivity.java
View File

@ -1,40 +1,20 @@
package com.tengshisoft.mudulemain.cultural.activitys.base;
import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.Unbinder;
import io.reactivex.Observable;
import io.reactivex.Observer;
import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.disposables.Disposable;
import io.reactivex.schedulers.Schedulers;
import okhttp3.RequestBody;
import android.annotation.SuppressLint;
import android.app.ProgressDialog;
import android.content.Intent;
import android.text.Editable;
import android.text.Selection;
import android.text.TextUtils;
import android.text.method.HideReturnsTransformationMethod;
import android.text.method.PasswordTransformationMethod;
import android.util.Base64;
import android.util.MonthDisplayHelper;
import android.view.View;
import android.widget.Button;
import android.widget.EditText;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.TextView;
import com.alibaba.android.arouter.facade.annotation.Route;
import com.alibaba.android.arouter.launcher.ARouter;
import com.google.gson.Gson;
import com.gyf.immersionbar.ImmersionBar;
import com.sucstepsoft.cm_utils.constant.PathConfig;
import com.sucstepsoft.cm_utils.constant.TimeConstants;
import com.sucstepsoft.cm_utils.core.beans.BaseSuccessBean;
import com.sucstepsoft.cm_utils.core.beans.UserRegisterPostBean;
import com.sucstepsoft.cm_utils.core.retrofit_net.RetrofitManager;
import com.sucstepsoft.cm_utils.core.retrofit_net.api.BaseApiService;
import com.sucstepsoft.cm_utils.core.retrofit_net.bean.BaseUserInfo;
@ -45,22 +25,23 @@ import com.sucstepsoft.cm_utils.utils.EncryptUtils;
import com.sucstepsoft.cm_utils.utils.ExceptionHandler;
import com.sucstepsoft.cm_utils.utils.LogUtils;
import com.sucstepsoft.cm_utils.utils.RegexUtils;
import com.sucstepsoft.cm_utils.utils.TimeUtils;
import com.sucstepsoft.cm_utils.utils.ToastUtils;
import com.sucstepsoft.cm_utils.utils.UIUtil;
import com.sucstepsoft.cm_utils.utils.UserLgUtils;
import com.tengshisoft.mudulemain.R;
import com.tengshisoft.mudulemain.R2;
import com.tengshisoft.mudulemain.cultural.beans.AppTokenUser;
import com.tengshisoft.mudulemain.cultural.beans.BaseUserBean;
import com.tengshisoft.mudulemain.cultural.beans.LoginUser;
import com.tengshisoft.mudulemain.cultural.net.HomeApi;
import com.tengshisoft.mudulemain.cultural.utils.AesUtil;
import org.aspectj.lang.annotation.Around;
import java.text.SimpleDateFormat;
import java.util.concurrent.TimeUnit;
import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.Unbinder;
import io.reactivex.Observer;
import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.disposables.Disposable;
import io.reactivex.schedulers.Schedulers;
import okhttp3.RequestBody;
/**
* 登录页面
@ -133,8 +114,7 @@ public class LoginActivity extends BaseActivity {
String pwd = mEtPwd.getText().toString().trim();
LoginUser info = new LoginUser();
info.setAppVersion(AppUtils.getAppVersionCode());
// info.setAppId(PathConfig.APP_VERSION_ID);
info.setAppId("");
info.setAppId(PathConfig.APP_VERSION_ID);
info.setUsername(phone);
String md5Pwd = EncryptUtils.encryptMD5ToStringTimes(pwd, 3);
info.setPassword(md5Pwd);

81
modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/activitys/base/MainActivity.java
View File

@ -1,62 +1,53 @@
package com.tengshisoft.mudulemain.cultural.activitys.base;
import android.app.DownloadManager;
import android.content.Intent;
import android.graphics.Typeface;
import android.net.Uri;
import android.os.Environment;
import android.text.TextUtils;
import android.view.View;
import com.alibaba.android.arouter.facade.annotation.Route;
import com.alibaba.android.arouter.launcher.ARouter;
import com.baidu.location.BDAbstractLocationListener;
import com.baidu.location.BDLocation;
import com.baidu.location.LocationClient;
import com.baidu.location.LocationClientOption;
import com.gyf.immersionbar.BarHide;
import com.gyf.immersionbar.ImmersionBar;
import com.ittianyu.bottomnavigationviewex.BottomNavigationViewEx;
import com.sucstepsoft.cm_utils.constant.PathConfig;
import com.sucstepsoft.cm_utils.constant.PermissionConstants;
import com.sucstepsoft.cm_utils.core.network.update.CheckUpdateUtils;
import com.sucstepsoft.cm_utils.core.network.update.service.DownloadService;
import com.sucstepsoft.cm_utils.core.network.update.utils.Constants;
import com.sucstepsoft.cm_utils.core.network.update.utils.NotificationHelper;
import com.sucstepsoft.cm_utils.core.retrofit_net.BaseUrlApi;
import com.sucstepsoft.cm_utils.core.retrofit_net.RetrofitManager;
import com.sucstepsoft.cm_utils.core.retrofit_net.api.BaseApiService;
import com.sucstepsoft.cm_utils.core.retrofit_net.bean.BaseUserInfo;
import com.sucstepsoft.cm_utils.core.retrofit_net.bean.VersionBean;
import com.sucstepsoft.cm_utils.core.widget.base.BaseActivity;
import com.sucstepsoft.cm_utils.core.widget.base.FragmentUtils;
import com.sucstepsoft.cm_utils.core.widget.base.NotificationUtils;
import com.sucstepsoft.cm_utils.core.widget.views.CenterDialogUpdateView;
import com.sucstepsoft.cm_utils.utils.FileUtils;
import com.sucstepsoft.cm_utils.utils.LogUtils;
import com.sucstepsoft.cm_utils.utils.PermissionUtils;
import com.sucstepsoft.cm_utils.utils.SPUtils;
import com.sucstepsoft.cm_utils.utils.ToastUtils;
import com.sucstepsoft.cm_utils.utils.UserLgUtils;
import com.tengshisoft.mudulemain.R;
import com.tengshisoft.mudulemain.R2;
import com.tengshisoft.mudulemain.cultural.fragment.HomeFragment;
import com.tengshisoft.mudulemain.cultural.net.HomeApi;
import org.aspectj.lang.annotation.Around;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.util.ArrayList;
import java.util.List;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentActivity;
import androidx.viewpager2.adapter.FragmentStateAdapter;
import androidx.viewpager2.widget.ViewPager2;
import com.alibaba.android.arouter.facade.annotation.Route;
import com.alibaba.android.arouter.launcher.ARouter;
import com.baidu.location.BDAbstractLocationListener;
import com.baidu.location.BDLocation;
import com.baidu.location.LocationClient;
import com.baidu.location.LocationClientOption;
import com.gyf.immersionbar.ImmersionBar;
import com.ittianyu.bottomnavigationviewex.BottomNavigationViewEx;
import com.sucstepsoft.cm_utils.constant.PathConfig;
import com.sucstepsoft.cm_utils.constant.PermissionConstants;
import com.sucstepsoft.cm_utils.core.network.update.CheckUpdateUtils;
import com.sucstepsoft.cm_utils.core.network.update.service.DownloadService;
import com.sucstepsoft.cm_utils.core.network.update.utils.Constants;
import com.sucstepsoft.cm_utils.core.retrofit_net.BaseUrlApi;
import com.sucstepsoft.cm_utils.core.retrofit_net.RetrofitManager;
import com.sucstepsoft.cm_utils.core.retrofit_net.api.BaseApiService;
import com.sucstepsoft.cm_utils.core.retrofit_net.bean.BaseUserInfo;
import com.sucstepsoft.cm_utils.core.retrofit_net.bean.VersionBean;
import com.sucstepsoft.cm_utils.core.widget.base.BaseActivity;
import com.sucstepsoft.cm_utils.core.widget.base.FragmentUtils;
import com.sucstepsoft.cm_utils.core.widget.views.CenterDialogUpdateView;
import com.sucstepsoft.cm_utils.utils.FileUtils;
import com.sucstepsoft.cm_utils.utils.LogUtils;
import com.sucstepsoft.cm_utils.utils.PermissionUtils;
import com.sucstepsoft.cm_utils.utils.ToastUtils;
import com.sucstepsoft.cm_utils.utils.UserLgUtils;
import com.tengshisoft.mudulemain.R;
import com.tengshisoft.mudulemain.R2;
import com.tengshisoft.mudulemain.cultural.fragment.HomeFragment;
import java.io.File;
import java.io.InputStream;
import java.util.ArrayList;
import java.util.List;
import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.Unbinder;

6
modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/net/HomeApi.java
View File

@ -57,7 +57,7 @@ public interface HomeApi {
* @return
*/
@Headers({"Content-Type: application/json", "Accept: application/json"})
@POST("app/sign/login")
@POST("app/sign/default")
Observable<BaseUserBean> doLogin(@Body RequestBody user);
/**
@ -254,7 +254,7 @@ public interface HomeApi {
* @return
*/
@Headers({"Content-Type:application/json", "Accept:application/json"})
@GET("app/dataarea/listareabyparentidrelease/{areaParentId}")
@GET("app/area/listallbyparentidrelease/{areaParentId}")
Observable<List<AreaListBean>> getAreaListByPid(@Path("areaParentId") String pId);
/**
@ -264,6 +264,6 @@ public interface HomeApi {
* @return
*/
@Headers({"Content-Type:application/json", "Accept:application/json"})
@GET("app/dataarea/listpagearea")
@GET("app/area/listpagearea")
Observable<SearchBean> doSearchByKeyword(@Query("page") int page, @Query("keywords") String key, @Header("token") String token);
}

20
modulemine/src/main/java/com/tengshisoft/modulemine/activity/MineInfoDetailActivity.java
View File

@ -242,7 +242,7 @@ public class MineInfoDetailActivity extends BaseActivity {
BaseDictionaryBean dBean = (BaseDictionaryBean) childAt.getTag(R.id.tag_bean);
UserInfoFieldBean fieldBean = (UserInfoFieldBean) group.getTag(R.id.tag_bean);
bean.setKey(fieldBean.getFieldName());
bean.setValue(dBean.getDictionaryId());
bean.setValue(dBean.getDataId());
return bean;
} else {
return null;
@ -304,7 +304,7 @@ public class MineInfoDetailActivity extends BaseActivity {
if (checked) {
try {
BaseDictionaryBean tag = (BaseDictionaryBean) cb.getTag(R.id.tag_bean);
checkIds = tag.getDictionaryId() + ",";
checkIds = tag.getDataId() + ",";
} catch (Exception e) {
e.printStackTrace();
}
@ -390,7 +390,7 @@ public class MineInfoDetailActivity extends BaseActivity {
try {
List<BaseDictionaryBean> list = (List<BaseDictionaryBean>) o;
if (list != null && list.size() > 0) {
mAllDictionary.put(list.get(0).getDictionaryParentId(), list);
mAllDictionary.put(list.get(0).getDataParentId(), list);
}
if (mAllDictionary.size() == tempList.size()) {
buildViews(userInfoFieldBeans);
@ -656,10 +656,10 @@ public class MineInfoDetailActivity extends BaseActivity {
params1.leftMargin = ConvertUtils.dp2px(15);
button.setLayoutParams(params1);
button.setPadding(5,0,0,0);
button.setText(list.get(i).getDictionaryName());
button.setText(list.get(i).getDataName());
button.setTextSize(12);
if (!TextUtils.isEmpty(selId)) {
if (selId.equals(list.get(i).getDictionaryId())) {
if (selId.equals(list.get(i).getDataId())) {
button.setChecked(true);
}
}
@ -694,7 +694,7 @@ public class MineInfoDetailActivity extends BaseActivity {
contentParams.topMargin = ConvertUtils.dp2px(5);
for (int i = 0; i < list.size(); i++) {
CheckBox checkBox = new CheckBox(mActivity);
checkBox.setText(list.get(i).getDictionaryName());
checkBox.setText(list.get(i).getDataName());
checkBox.setTag(R.id.tag_bean, list.get(i));
checkBox.setTextSize(12);
checkBox.setPadding(ConvertUtils.dp2px(5), ConvertUtils.dp2px(5), ConvertUtils.dp2px(5), ConvertUtils.dp2px(5));
@ -794,8 +794,8 @@ public class MineInfoDetailActivity extends BaseActivity {
List<BaseDictionaryBean> list = mAllDictionary.get(fieldBean.getDictionaryId());
if (list != null && list.size() > 0) {
for (int i = 0; i < list.size(); i++) {
if (asString.equals(list.get(i).getDictionaryId())) {
contentValue = list.get(i).getDictionaryName();
if (asString.equals(list.get(i).getDataId())) {
contentValue = list.get(i).getDataName();
break;
}
}
@ -868,8 +868,8 @@ public class MineInfoDetailActivity extends BaseActivity {
List<BaseDictionaryBean> list1 = mAllDictionary.get(tag.getDictionaryId());
if (list1 != null && list1.size() > 0) {
mTextViewPicker = new OptionsPickerBuilder(MineInfoDetailActivity.this, (options1, options2, options3, v) -> {
view.setText(list1.get(options1).getDictionaryName());
view.setTag(R.id.tag_sel_id, list1.get(options1).getDictionaryId());
view.setText(list1.get(options1).getDataName());
view.setTag(R.id.tag_sel_id, list1.get(options1).getDataId());
}).setTitleText("请选择")
.setCancelColor(Color.parseColor("#1189FF"))
.setSubmitColor(Color.parseColor("#1189FF"))

28
modulemine/src/main/java/com/tengshisoft/modulemine/activity/MineInfoEditActivity.java
View File

@ -4,10 +4,7 @@ import android.app.ProgressDialog;
import android.graphics.Color;
import android.graphics.drawable.Drawable;
import android.text.TextUtils;
import android.util.Base64;
import android.view.Gravity;
import android.view.TextureView;
import android.view.View;
import android.widget.CheckBox;
import android.widget.EditText;
import android.widget.LinearLayout;
@ -41,24 +38,19 @@ import com.sucstepsoft.cm_utils.utils.UIUtil;
import com.sucstepsoft.cm_utils.utils.UserLgUtils;
import com.tengshisoft.modulemine.R;
import com.tengshisoft.modulemine.R2;
import com.tengshisoft.mudulemain.cultural.beans.AppTokenUser;
import com.tengshisoft.mudulemain.cultural.utils.AesUtil;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.HashMap;
import java.util.IdentityHashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;
import butterknife.BindInt;
import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.Unbinder;
import io.reactivex.MaybeEmitter;
import io.reactivex.Observable;
import io.reactivex.Observer;
import io.reactivex.android.schedulers.AndroidSchedulers;
@ -295,7 +287,7 @@ public class MineInfoEditActivity extends BaseActivity {
BaseDictionaryBean dBean = (BaseDictionaryBean) childAt.getTag(R.id.tag_bean);
UserInfoFieldBean fieldBean = (UserInfoFieldBean) group.getTag(R.id.tag_bean);
bean.setKey(fieldBean.getFieldName());
bean.setValue(dBean.getDictionaryId());
bean.setValue(dBean.getDataId());
return bean;
} else {
return null;
@ -357,7 +349,7 @@ public class MineInfoEditActivity extends BaseActivity {
if (checked) {
try {
BaseDictionaryBean tag = (BaseDictionaryBean) cb.getTag(R.id.tag_bean);
checkIds = tag.getDictionaryId() + ",";
checkIds = tag.getDataId() + ",";
} catch (Exception e) {
e.printStackTrace();
}
@ -443,7 +435,7 @@ public class MineInfoEditActivity extends BaseActivity {
try {
List<BaseDictionaryBean> list = (List<BaseDictionaryBean>) o;
if (list != null && list.size() > 0) {
mAllDictionary.put(list.get(0).getDictionaryParentId(), list);
mAllDictionary.put(list.get(0).getDataParentId(), list);
}
if (mAllDictionary.size() == tempList.size()) {
buildViews(userInfoFieldBeans);
@ -724,10 +716,10 @@ public class MineInfoEditActivity extends BaseActivity {
params1.leftMargin = ConvertUtils.dp2px(15);
button.setLayoutParams(params1);
button.setPadding(5, 0, 0, 0);
button.setText(list.get(i).getDictionaryName());
button.setText(list.get(i).getDataName());
button.setTextSize(12);
if (!TextUtils.isEmpty(selId)) {
if (selId.equals(list.get(i).getDictionaryId())) {
if (selId.equals(list.get(i).getDataId())) {
button.setChecked(true);
}
}
@ -761,7 +753,7 @@ public class MineInfoEditActivity extends BaseActivity {
contentParams.topMargin = ConvertUtils.dp2px(5);
for (int i = 0; i < list.size(); i++) {
CheckBox checkBox = new CheckBox(mActivity);
checkBox.setText(list.get(i).getDictionaryName());
checkBox.setText(list.get(i).getDataName());
checkBox.setTag(R.id.tag_bean, list.get(i));
checkBox.setTextSize(12);
checkBox.setPadding(ConvertUtils.dp2px(5), ConvertUtils.dp2px(5), ConvertUtils.dp2px(5), ConvertUtils.dp2px(5));
@ -864,8 +856,8 @@ public class MineInfoEditActivity extends BaseActivity {
List<BaseDictionaryBean> list = mAllDictionary.get(fieldBean.getDictionaryId());
if (list != null && list.size() > 0) {
for (int i = 0; i < list.size(); i++) {
if (asString.equals(list.get(i).getDictionaryId())) {
contentValue = list.get(i).getDictionaryName();
if (asString.equals(list.get(i).getDataId())) {
contentValue = list.get(i).getDataName();
break;
}
}
@ -942,8 +934,8 @@ public class MineInfoEditActivity extends BaseActivity {
List<BaseDictionaryBean> list1 = mAllDictionary.get(tag.getDictionaryId());
if (list1 != null && list1.size() > 0) {
mTextViewPicker = new OptionsPickerBuilder(MineInfoEditActivity.this, (options1, options2, options3, v) -> {
view.setText(list1.get(options1).getDictionaryName());
view.setTag(R.id.tag_sel_id, list1.get(options1).getDictionaryId());
view.setText(list1.get(options1).getDataName());
view.setTag(R.id.tag_sel_id, list1.get(options1).getDataId());
}).setTitleText("请选择")
.setCancelColor(Color.parseColor("#1189FF"))
.setSubmitColor(Color.parseColor("#1189FF"))

24
modulemine/src/main/java/com/tengshisoft/modulemine/fragments/MineMainFragment.java
View File

@ -2,20 +2,20 @@ package com.tengshisoft.modulemine.fragments;
import android.app.ProgressDialog;
import android.content.Intent;
import android.content.res.Configuration;
import android.database.Cursor;
import android.hardware.camera2.CameraCaptureSession;
import android.net.Uri;
import android.os.Build;
import android.os.Bundle;
import android.os.Environment;
import android.provider.MediaStore;
import android.text.TextUtils;
import android.util.Base64;
import android.view.Gravity;
import android.view.View;
import android.widget.ImageView;
import android.widget.TextView;
import androidx.annotation.Nullable;
import androidx.core.content.FileProvider;
import androidx.recyclerview.widget.GridLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import com.alibaba.android.arouter.facade.annotation.Route;
import com.alibaba.android.arouter.launcher.ARouter;
@ -23,9 +23,6 @@ import com.bumptech.glide.Glide;
import com.bumptech.glide.load.resource.bitmap.CircleCrop;
import com.bumptech.glide.request.RequestOptions;
import com.google.gson.Gson;
import com.gyf.immersionbar.ImmersionBar;
import com.gyf.immersionbar.components.SimpleImmersionOwner;
import com.gyf.immersionbar.components.SimpleImmersionProxy;
import com.sucstepsoft.cm_utils.constant.PathConfig;
import com.sucstepsoft.cm_utils.constant.PermissionConstants;
import com.sucstepsoft.cm_utils.core.beans.BaseSuccessBean;
@ -37,11 +34,8 @@ import com.sucstepsoft.cm_utils.core.retrofit_net.api.BaseApiService;
import com.sucstepsoft.cm_utils.core.retrofit_net.bean.BaseUserInfo;
import com.sucstepsoft.cm_utils.core.widget.base.BaseFragment;
import com.sucstepsoft.cm_utils.core.widget.base.BaseFuncAdapter;
import com.sucstepsoft.cm_utils.core.widget.base.BaseRecyclerAdapter;
import com.sucstepsoft.cm_utils.core.widget.views.ButtomDialogView;
import com.sucstepsoft.cm_utils.core.widget.views.FuncBtnAdapter;
import com.sucstepsoft.cm_utils.core.widget.views.TypeFaceTextView;
import com.sucstepsoft.cm_utils.utils.LogUtils;
import com.sucstepsoft.cm_utils.utils.PermissionUtils;
import com.sucstepsoft.cm_utils.utils.ProiderUtil;
import com.sucstepsoft.cm_utils.utils.ToastUtils;
@ -49,19 +43,11 @@ import com.sucstepsoft.cm_utils.utils.UIUtil;
import com.sucstepsoft.cm_utils.utils.UserLgUtils;
import com.tengshisoft.modulemine.R;
import com.tengshisoft.modulemine.R2;
import com.tengshisoft.mudulemain.cultural.beans.AppTokenUser;
import com.tengshisoft.mudulemain.cultural.beans.BaseUserBean;
import com.tengshisoft.mudulemain.cultural.utils.AesUtil;
import java.io.File;
import java.util.ArrayList;
import java.util.List;
import androidx.annotation.Nullable;
import androidx.core.content.FileProvider;
import androidx.recyclerview.widget.GridLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import butterknife.BindInt;
import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.Unbinder;

2
moduleplace/src/main/java/com/tengshisoft/moduleplace/net/ApiPlace.java
View File

@ -101,7 +101,7 @@ public interface ApiPlace {
* @return
*/
@Headers({"base_url_name:place", "Content-Type:application/json", "Accept:application/json"})
@GET("api/sms/getverificationcode/{phone}")
@GET("app/sms/verify-code/{phone}")
Observable<BaseSuccessBean> getVerifyCode(@Path("phone") String phone);
// /**
// * 获取验证码