diff --git a/baselib/build.gradle b/baselib/build.gradle index fb92fab..18ce2a0 100755 --- a/baselib/build.gradle +++ b/baselib/build.gradle @@ -94,7 +94,7 @@ dependencies { api 'me.rosuh:AndroidFilePicker:0.8.3' //toast - api 'com.github.getActivity:ToastUtils:9.5' + api 'com.github.getActivity:Toaster:12.3' //图片压缩 api "top.zibin:Luban:$rootProject.ext.lubanVersio" diff --git a/baselib/src/main/java/com/tenlionsoft/baselib/app/BaseAppContext.java b/baselib/src/main/java/com/tenlionsoft/baselib/app/BaseAppContext.java index ab6aa42..96e71a2 100644 --- a/baselib/src/main/java/com/tenlionsoft/baselib/app/BaseAppContext.java +++ b/baselib/src/main/java/com/tenlionsoft/baselib/app/BaseAppContext.java @@ -8,7 +8,8 @@ import android.net.NetworkInfo; import android.os.PowerManager; import android.view.Gravity; -import com.hjq.toast.ToastUtils; +import com.hjq.toast.Toaster; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.scwang.smart.refresh.footer.ClassicsFooter; import com.scwang.smart.refresh.layout.SmartRefreshLayout; import com.tenlionsoft.baselib.constant.BroadcastConstant; @@ -62,8 +63,8 @@ public class BaseAppContext extends MultiDexApplication { public void onCreate() { super.onCreate(); app = this; - ToastUtils.init(this); - ToastUtils.setGravity(Gravity.BOTTOM, 0, 100); + Toaster.init(this); + Toaster.setGravity(Gravity.TOP, 0, 100); PowerManager powerManager = (PowerManager) getSystemService(POWER_SERVICE); isScreenOn = powerManager.isInteractive(); screenTurningOff(); diff --git a/baselib/src/main/java/com/tenlionsoft/baselib/constant/PathConfig.java b/baselib/src/main/java/com/tenlionsoft/baselib/constant/PathConfig.java index 7dc732f..9becda3 100755 --- a/baselib/src/main/java/com/tenlionsoft/baselib/constant/PathConfig.java +++ b/baselib/src/main/java/com/tenlionsoft/baselib/constant/PathConfig.java @@ -86,6 +86,7 @@ public class PathConfig { public static final String DEFAULT_AREA_CODE = "0";//地区 public static final String PLACE_TYPE_ID = "df8b758c-f6d8-465a-9aa8-c451fde47076";//场馆类型字典 + public static final String NOTICE_CID = "4197a23f-2cae-480f-8eb1-086956a51736";//通知公告ID public static final String CITY_DEFAULT_CODE = "640675"; public static final String CITY_DEFAULT_NAME = "日喀则市"; public static final int CITY_DEFAULT_LEVEL = 3; @@ -321,8 +322,10 @@ public class PathConfig { public static final String PATH_MODULE_COMMON_ACTIVITY_SEL_GRID = "/modulecommon/activity/chooseGrid";//网格选取 public static final String PATH_MODULE_COMMON_ACTIVITY_BIND_GRID = "/modulecommon/activity/bindGrid";//网格绑定 public static final String PATH_MODULE_COMMON_FRAGMENT_KNOW_LEDGE_LIST = "/modulecommon/fragment/knowLedgeList"; - public static final String PATH_MODULE_COMMON_FRAGMENT_GRID_INCIDENT_STATISTICS = "/modulecommon/fragment/gridIncidentStatistics";//网格员事件上报统计 - public static final String PATH_MODULE_COMMON_FRAGMENT_GRID_POPULACE_STATISTICS = "/modulecommon/fragment/gridPopulaceStatistics";//网格员人口统计 + public static final String PATH_MODULE_COMMON_FRAGMENT_GRID_INCIDENT_STATISTICS = "/modulecommon/fragment" + + "/gridIncidentStatistics";//网格员事件上报统计 + public static final String PATH_MODULE_COMMON_FRAGMENT_GRID_POPULACE_STATISTICS = "/modulecommon/fragment" + + "/gridPopulaceStatistics";//网格员人口统计 //知识库列表 public static final String PATH_MODULE_COMMON_FRAGMENT_KNOW_LEDGE_LIST_BY_DEPT = "/modulecommon/fragment" + "/knowLedgeListByDept";//部门黄页 @@ -683,6 +686,10 @@ public class PathConfig { public static final String PATH_MODULE_GRID_ACTIVITY_PATROL_EXPRESS_EDIT = "/modulegrid/activity" + "/patrolExpressEdit";//快递物流巡查编辑 + public static final String PATH_MODULE_COMMON_ACTIVITY_NOTICE_LIST = "/modulecommon/activity/noticeList";//通知列表 + + public static final String PATH_MODULE_COMMON_ACTIVITY_NOTICE_DETAIL = "/modulecommon/activity/noticeDetail"; + //通知详情 //部件 public static final String PATH_MODULE_GRID_ACTIVITY_COMPONENT_LIST = "/modulegrid/activity/componentList";//部件列表 diff --git a/baselib/src/main/java/com/tenlionsoft/baselib/core/beans/PersonFlowSearchBean.java b/baselib/src/main/java/com/tenlionsoft/baselib/core/beans/PersonFlowSearchBean.java new file mode 100644 index 0000000..9cefa4a --- /dev/null +++ b/baselib/src/main/java/com/tenlionsoft/baselib/core/beans/PersonFlowSearchBean.java @@ -0,0 +1,428 @@ +package com.tenlionsoft.baselib.core.beans; + +public class PersonFlowSearchBean { + + private String areaCode; + private String areaId; + private String areaNames; + private String birthDate; + private String cardExpireDate; + private String cardNumber; + private String currentResidence; + private String currentResidenceAddr; + private String currentResidenceDictionaryName; + private String education; + private String educationDictionaryName; + private String floatingPopulationId; + private String fullName; + private String gender; + private String genderDictionaryName; + private String gridId; + private String gridName; + private String healthyStatus; + private String idCardNumber; + private String inflowReason; + private String inflowReasonDict; + private String keyOfFollow; + private String maritalStatus; + private String maritalStatusDictionaryName; + private String nameUsedBefore; + private String nation; + private String nationDictionaryName; + private String nativePlace; + private String nativePlaceAddr; + private String nativePlaceDictionaryName; + private String occupation; + private String occupationCategory; + private String occupationCategoryDictionaryName; + private String politicalStatus; + private String politicalStatusDictionaryName; + private String registerDate; + private String registeredResidence; + private String registeredResidenceAddr; + private String registeredResidenceDictionaryName; + private String registrationType; + private String registrationTypeDict; + private String religion; + private String religionDictionaryName; + private String residenceType; + private String residenceTypeDict; + private String serviceSpace; + private String telephone; + + public String getAreaCode() { + return areaCode; + } + + public void setAreaCode(String areaCode) { + this.areaCode = areaCode; + } + + public String getAreaId() { + return areaId; + } + + public void setAreaId(String areaId) { + this.areaId = areaId; + } + + public String getAreaNames() { + return areaNames; + } + + public void setAreaNames(String areaNames) { + this.areaNames = areaNames; + } + + public String getBirthDate() { + return birthDate; + } + + public void setBirthDate(String birthDate) { + this.birthDate = birthDate; + } + + public String getCardExpireDate() { + return cardExpireDate; + } + + public void setCardExpireDate(String cardExpireDate) { + this.cardExpireDate = cardExpireDate; + } + + public String getCardNumber() { + return cardNumber; + } + + public void setCardNumber(String cardNumber) { + this.cardNumber = cardNumber; + } + + public String getCurrentResidence() { + return currentResidence; + } + + public void setCurrentResidence(String currentResidence) { + this.currentResidence = currentResidence; + } + + public String getCurrentResidenceAddr() { + return currentResidenceAddr; + } + + public void setCurrentResidenceAddr(String currentResidenceAddr) { + this.currentResidenceAddr = currentResidenceAddr; + } + + public String getCurrentResidenceDictionaryName() { + return currentResidenceDictionaryName; + } + + public void setCurrentResidenceDictionaryName(String currentResidenceDictionaryName) { + this.currentResidenceDictionaryName = currentResidenceDictionaryName; + } + + public String getEducation() { + return education; + } + + public void setEducation(String education) { + this.education = education; + } + + public String getEducationDictionaryName() { + return educationDictionaryName; + } + + public void setEducationDictionaryName(String educationDictionaryName) { + this.educationDictionaryName = educationDictionaryName; + } + + public String getFloatingPopulationId() { + return floatingPopulationId; + } + + public void setFloatingPopulationId(String floatingPopulationId) { + this.floatingPopulationId = floatingPopulationId; + } + + public String getFullName() { + return fullName; + } + + public void setFullName(String fullName) { + this.fullName = fullName; + } + + public String getGender() { + return gender; + } + + public void setGender(String gender) { + this.gender = gender; + } + + public String getGenderDictionaryName() { + return genderDictionaryName; + } + + public void setGenderDictionaryName(String genderDictionaryName) { + this.genderDictionaryName = genderDictionaryName; + } + + public String getGridId() { + return gridId; + } + + public void setGridId(String gridId) { + this.gridId = gridId; + } + + public String getGridName() { + return gridName; + } + + public void setGridName(String gridName) { + this.gridName = gridName; + } + + public String getHealthyStatus() { + return healthyStatus; + } + + public void setHealthyStatus(String healthyStatus) { + this.healthyStatus = healthyStatus; + } + + public String getIdCardNumber() { + return idCardNumber; + } + + public void setIdCardNumber(String idCardNumber) { + this.idCardNumber = idCardNumber; + } + + public String getInflowReason() { + return inflowReason; + } + + public void setInflowReason(String inflowReason) { + this.inflowReason = inflowReason; + } + + public String getInflowReasonDict() { + return inflowReasonDict; + } + + public void setInflowReasonDict(String inflowReasonDict) { + this.inflowReasonDict = inflowReasonDict; + } + + public String getKeyOfFollow() { + return keyOfFollow; + } + + public void setKeyOfFollow(String keyOfFollow) { + this.keyOfFollow = keyOfFollow; + } + + public String getMaritalStatus() { + return maritalStatus; + } + + public void setMaritalStatus(String maritalStatus) { + this.maritalStatus = maritalStatus; + } + + public String getMaritalStatusDictionaryName() { + return maritalStatusDictionaryName; + } + + public void setMaritalStatusDictionaryName(String maritalStatusDictionaryName) { + this.maritalStatusDictionaryName = maritalStatusDictionaryName; + } + + public String getNameUsedBefore() { + return nameUsedBefore; + } + + public void setNameUsedBefore(String nameUsedBefore) { + this.nameUsedBefore = nameUsedBefore; + } + + public String getNation() { + return nation; + } + + public void setNation(String nation) { + this.nation = nation; + } + + public String getNationDictionaryName() { + return nationDictionaryName; + } + + public void setNationDictionaryName(String nationDictionaryName) { + this.nationDictionaryName = nationDictionaryName; + } + + public String getNativePlace() { + return nativePlace; + } + + public void setNativePlace(String nativePlace) { + this.nativePlace = nativePlace; + } + + public String getNativePlaceAddr() { + return nativePlaceAddr; + } + + public void setNativePlaceAddr(String nativePlaceAddr) { + this.nativePlaceAddr = nativePlaceAddr; + } + + public String getNativePlaceDictionaryName() { + return nativePlaceDictionaryName; + } + + public void setNativePlaceDictionaryName(String nativePlaceDictionaryName) { + this.nativePlaceDictionaryName = nativePlaceDictionaryName; + } + + public String getOccupation() { + return occupation; + } + + public void setOccupation(String occupation) { + this.occupation = occupation; + } + + public String getOccupationCategory() { + return occupationCategory; + } + + public void setOccupationCategory(String occupationCategory) { + this.occupationCategory = occupationCategory; + } + + public String getOccupationCategoryDictionaryName() { + return occupationCategoryDictionaryName; + } + + public void setOccupationCategoryDictionaryName(String occupationCategoryDictionaryName) { + this.occupationCategoryDictionaryName = occupationCategoryDictionaryName; + } + + public String getPoliticalStatus() { + return politicalStatus; + } + + public void setPoliticalStatus(String politicalStatus) { + this.politicalStatus = politicalStatus; + } + + public String getPoliticalStatusDictionaryName() { + return politicalStatusDictionaryName; + } + + public void setPoliticalStatusDictionaryName(String politicalStatusDictionaryName) { + this.politicalStatusDictionaryName = politicalStatusDictionaryName; + } + + public String getRegisterDate() { + return registerDate; + } + + public void setRegisterDate(String registerDate) { + this.registerDate = registerDate; + } + + public String getRegisteredResidence() { + return registeredResidence; + } + + public void setRegisteredResidence(String registeredResidence) { + this.registeredResidence = registeredResidence; + } + + public String getRegisteredResidenceAddr() { + return registeredResidenceAddr; + } + + public void setRegisteredResidenceAddr(String registeredResidenceAddr) { + this.registeredResidenceAddr = registeredResidenceAddr; + } + + public String getRegisteredResidenceDictionaryName() { + return registeredResidenceDictionaryName; + } + + public void setRegisteredResidenceDictionaryName(String registeredResidenceDictionaryName) { + this.registeredResidenceDictionaryName = registeredResidenceDictionaryName; + } + + public String getRegistrationType() { + return registrationType; + } + + public void setRegistrationType(String registrationType) { + this.registrationType = registrationType; + } + + public String getRegistrationTypeDict() { + return registrationTypeDict; + } + + public void setRegistrationTypeDict(String registrationTypeDict) { + this.registrationTypeDict = registrationTypeDict; + } + + public String getReligion() { + return religion; + } + + public void setReligion(String religion) { + this.religion = religion; + } + + public String getReligionDictionaryName() { + return religionDictionaryName; + } + + public void setReligionDictionaryName(String religionDictionaryName) { + this.religionDictionaryName = religionDictionaryName; + } + + public String getResidenceType() { + return residenceType; + } + + public void setResidenceType(String residenceType) { + this.residenceType = residenceType; + } + + public String getResidenceTypeDict() { + return residenceTypeDict; + } + + public void setResidenceTypeDict(String residenceTypeDict) { + this.residenceTypeDict = residenceTypeDict; + } + + public String getServiceSpace() { + return serviceSpace; + } + + public void setServiceSpace(String serviceSpace) { + this.serviceSpace = serviceSpace; + } + + public String getTelephone() { + return telephone; + } + + public void setTelephone(String telephone) { + this.telephone = telephone; + } +} diff --git a/baselib/src/main/java/com/tenlionsoft/baselib/core/beans/PersonSearchBean.java b/baselib/src/main/java/com/tenlionsoft/baselib/core/beans/PersonSearchBean.java index cb7f263..4d01f40 100644 --- a/baselib/src/main/java/com/tenlionsoft/baselib/core/beans/PersonSearchBean.java +++ b/baselib/src/main/java/com/tenlionsoft/baselib/core/beans/PersonSearchBean.java @@ -50,6 +50,9 @@ public class PersonSearchBean { private String telephone; private String type; + + + public String getAreaCode() { return areaCode; } diff --git a/baselib/src/main/java/com/tenlionsoft/baselib/core/network/update/service/DownloadService.java b/baselib/src/main/java/com/tenlionsoft/baselib/core/network/update/service/DownloadService.java index 43d1c1a..a60bb6d 100644 --- a/baselib/src/main/java/com/tenlionsoft/baselib/core/network/update/service/DownloadService.java +++ b/baselib/src/main/java/com/tenlionsoft/baselib/core/network/update/service/DownloadService.java @@ -4,7 +4,7 @@ import android.app.Service; import android.content.Intent; import android.os.IBinder; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tenlionsoft.baselib.core.network.HttpUtils; import com.tenlionsoft.baselib.core.network.response.DownloadResponseHandler; import com.tenlionsoft.baselib.core.network.update.utils.ApkUtils; diff --git a/baselib/src/main/java/com/tenlionsoft/baselib/core/retrofit_net/BaseUrlApi.java b/baselib/src/main/java/com/tenlionsoft/baselib/core/retrofit_net/BaseUrlApi.java index 9744685..51868e3 100755 --- a/baselib/src/main/java/com/tenlionsoft/baselib/core/retrofit_net/BaseUrlApi.java +++ b/baselib/src/main/java/com/tenlionsoft/baselib/core/retrofit_net/BaseUrlApi.java @@ -45,6 +45,7 @@ public class BaseUrlApi { // public static final String BASE_VISITS_IP = "http://192.168.0.111:8084/" + SYS_VISITS; public static final String BASE_IMG_URL = BASE_URL + "route/file/download/true/"; + public static final String BASE_IMG_URL_V2 = BASE_URL + "route/file/v2/download/true/"; public static final String APK_DOWNLOAD_URL = "downloadUrl"; public static final String UPDATE_URL = "version.json"; diff --git a/baselib/src/main/java/com/tenlionsoft/baselib/core/retrofit_net/api/BaseApiService.java b/baselib/src/main/java/com/tenlionsoft/baselib/core/retrofit_net/api/BaseApiService.java index 0f96517..d272761 100755 --- a/baselib/src/main/java/com/tenlionsoft/baselib/core/retrofit_net/api/BaseApiService.java +++ b/baselib/src/main/java/com/tenlionsoft/baselib/core/retrofit_net/api/BaseApiService.java @@ -7,6 +7,7 @@ import com.tenlionsoft.baselib.core.beans.BaseDictionaryBean; import com.tenlionsoft.baselib.core.beans.BaseSuccessBean; import com.tenlionsoft.baselib.core.beans.DicBean; import com.tenlionsoft.baselib.core.beans.DictionaryBean; +import com.tenlionsoft.baselib.core.beans.PersonFlowSearchBean; import com.tenlionsoft.baselib.core.beans.PersonSearchBean; import com.tenlionsoft.baselib.core.beans.UploadBean; import com.tenlionsoft.baselib.core.beans.UserExpandInfoBean; @@ -344,6 +345,12 @@ public interface BaseApiService { @Headers({"base_url_name:person", "Content-Type: application/json", "Accept: application/json"}) @GET("app/basepopulationinfo/release/getByIdCardNumber/{idCardNumber}") Observable doSearchPerson(@Path("idCardNumber") String card, @Header("token") String token); + /** + * 根据身份证号码搜索人-流动人口 + */ + @Headers({"base_url_name:person", "Content-Type: application/json", "Accept: application/json"}) + @GET("app/floatingpopulation/getByIdCardNumber/{idCardNumber}") + Observable doSearchFLowPerson(@Path("idCardNumber") String card, @Header("token") String token); /** * 获取当前用户拓展信息 diff --git a/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/PhotoActivity.java b/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/PhotoActivity.java index 20e7902..e7d807f 100755 --- a/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/PhotoActivity.java +++ b/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/PhotoActivity.java @@ -11,7 +11,7 @@ import android.widget.TextView; import com.alibaba.android.arouter.facade.annotation.Route; import com.bumptech.glide.Glide; import com.bumptech.glide.request.target.Target; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tenlionsoft.baselib.R; import com.tenlionsoft.baselib.R2; import com.tenlionsoft.baselib.constant.PathConfig; diff --git a/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/TakeVideoActivity.java b/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/TakeVideoActivity.java index 7a9b74d..4a44869 100644 --- a/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/TakeVideoActivity.java +++ b/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/TakeVideoActivity.java @@ -8,7 +8,7 @@ import android.util.Log; import android.view.View; import com.alibaba.android.arouter.facade.annotation.Route; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.luck.picture.lib.tools.BitmapUtils; import com.tenlionsoft.baselib.R; import com.tenlionsoft.baselib.R2; diff --git a/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/base/BaseActivity.java b/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/base/BaseActivity.java index 024603b..b6ffc2c 100755 --- a/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/base/BaseActivity.java +++ b/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/base/BaseActivity.java @@ -21,10 +21,13 @@ import android.text.TextUtils; import android.text.TextWatcher; import android.util.DisplayMetrics; import android.view.Display; +import android.view.KeyCharacterMap; +import android.view.KeyEvent; import android.view.LayoutInflater; import android.view.MotionEvent; import android.view.TouchDelegate; import android.view.View; +import android.view.ViewConfiguration; import android.view.WindowManager; import android.view.animation.LinearInterpolator; import android.view.inputmethod.EditorInfo; @@ -44,7 +47,7 @@ import androidx.appcompat.app.AppCompatActivity; import com.alibaba.android.arouter.launcher.ARouter; import com.gyf.immersionbar.ImmersionBar; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tenlionsoft.baselib.R; import com.tenlionsoft.baselib.constant.PathConfig; import com.tenlionsoft.baselib.core.widget.views.AfxTextView; @@ -149,7 +152,9 @@ public abstract class BaseActivity extends AppCompatActivity { } - + /** + * 判断是否开启虚拟按键 + */ protected boolean isNavBarHasShown(Context ctx) { String brand = Build.BRAND; LogUtils.e(brand); @@ -203,6 +208,18 @@ public abstract class BaseActivity extends AppCompatActivity { } } + /** + * 判断是否有虚拟按键 + */ + protected boolean checkDeviceHasNavigationBar(Context ctx) { + boolean hasMenuKey = ViewConfiguration.get(ctx).hasPermanentMenuKey(); + boolean hasBackKey = KeyCharacterMap.deviceHasKey(KeyEvent.KEYCODE_BACK); + if (!hasMenuKey & !hasBackKey) { + return true; + } + return false; + } + /** * 非全面屏下 虚拟键高度(无论是否隐藏) * @@ -604,6 +621,13 @@ public abstract class BaseActivity extends AppCompatActivity { hideSoftKeyboard(getCurrentFocus()); } + public void hideSoftKeyboard(EditText editText){ + InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE); + if (editText != null) { + imm.hideSoftInputFromWindow(editText.getWindowToken(), 0); + } + } + @Override public boolean dispatchTouchEvent(MotionEvent ev) { diff --git a/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/AddCarPersonDialog.java b/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/AddCarPersonDialog.java index 34081a5..4d0ea2c 100755 --- a/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/AddCarPersonDialog.java +++ b/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/AddCarPersonDialog.java @@ -19,7 +19,7 @@ import android.widget.TextView; import com.bigkoo.pickerview.builder.TimePickerBuilder; import com.bigkoo.pickerview.view.TimePickerView; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tenlionsoft.baselib.R; import com.tenlionsoft.baselib.utils.RegexUtils; import com.tenlionsoft.baselib.utils.TimeUtils; diff --git a/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/AddPersonDialog.java b/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/AddPersonDialog.java index a0c341f..5ffa2fd 100755 --- a/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/AddPersonDialog.java +++ b/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/AddPersonDialog.java @@ -21,7 +21,7 @@ import android.widget.CompoundButton; import android.widget.EditText; import android.widget.ImageView; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tenlionsoft.baselib.R; import com.tenlionsoft.baselib.utils.RegexUtils; diff --git a/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/AppraiseDialog.java b/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/AppraiseDialog.java index 7b69aca..67aed01 100755 --- a/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/AppraiseDialog.java +++ b/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/AppraiseDialog.java @@ -16,7 +16,7 @@ import android.view.inputmethod.InputMethodManager; import android.widget.EditText; import android.widget.RatingBar; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tenlionsoft.baselib.R; import com.tenlionsoft.baselib.utils.RegexUtils; diff --git a/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/AreaChooseDialog.java b/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/AreaChooseDialog.java index a49b91d..4327a99 100755 --- a/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/AreaChooseDialog.java +++ b/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/AreaChooseDialog.java @@ -17,7 +17,7 @@ import android.widget.TextView; import com.bigkoo.pickerview.builder.OptionsPickerBuilder; import com.bigkoo.pickerview.view.OptionsPickerView; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tenlionsoft.baselib.R; import com.tenlionsoft.baselib.constant.PathConfig; import com.tenlionsoft.baselib.core.beans.AreaBean; diff --git a/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/BaseAreaListDialog.java b/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/BaseAreaListDialog.java index 86556fb..8fb3666 100755 --- a/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/BaseAreaListDialog.java +++ b/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/BaseAreaListDialog.java @@ -18,7 +18,7 @@ import android.view.WindowManager; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tenlionsoft.baselib.R; import com.tenlionsoft.baselib.core.beans.UserLoginBean; import com.tenlionsoft.baselib.utils.UserInfoSPUtils; diff --git a/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/ButtomDialogCommentView.java b/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/ButtomDialogCommentView.java index 940f4d0..71cc921 100755 --- a/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/ButtomDialogCommentView.java +++ b/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/ButtomDialogCommentView.java @@ -17,7 +17,7 @@ import android.widget.RelativeLayout; import android.widget.TextView; import com.bumptech.glide.Glide; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tenlionsoft.baselib.R; import com.tenlionsoft.baselib.core.beans.AddPhotoBean; import com.tenlionsoft.baselib.core.retrofit_net.BaseUrlApi; diff --git a/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/CenterBaseInputView.java b/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/CenterBaseInputView.java index a2f675a..fd9556d 100755 --- a/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/CenterBaseInputView.java +++ b/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/CenterBaseInputView.java @@ -16,7 +16,7 @@ import android.view.inputmethod.InputMethodManager; import android.widget.EditText; import com.bigkoo.pickerview.view.TimePickerView; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tenlionsoft.baselib.R; import java.text.SimpleDateFormat; diff --git a/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/CenterChooseAreaDialogView.java b/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/CenterChooseAreaDialogView.java index c9753b2..18dccaf 100755 --- a/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/CenterChooseAreaDialogView.java +++ b/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/CenterChooseAreaDialogView.java @@ -17,7 +17,7 @@ import android.widget.TextView; import com.bigkoo.pickerview.builder.OptionsPickerBuilder; import com.bigkoo.pickerview.view.OptionsPickerView; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tenlionsoft.baselib.R; import com.tenlionsoft.baselib.constant.PathConfig; import com.tenlionsoft.baselib.core.beans.AreaBean; diff --git a/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/CenterGridPhoneListView.java b/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/CenterGridPhoneListView.java index 5f653d7..5a41ee8 100755 --- a/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/CenterGridPhoneListView.java +++ b/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/CenterGridPhoneListView.java @@ -21,7 +21,7 @@ import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; import com.bigkoo.pickerview.view.TimePickerView; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tenlionsoft.baselib.R; import com.tenlionsoft.baselib.core.beans.PersonSearchBean; import com.tenlionsoft.baselib.core.widget.base.BaseRecyclerAdapter; diff --git a/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/CenterInputChooseView.java b/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/CenterInputChooseView.java index 9376426..5ed6e53 100755 --- a/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/CenterInputChooseView.java +++ b/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/CenterInputChooseView.java @@ -17,7 +17,7 @@ import android.widget.EditText; import android.widget.RadioGroup; import com.bigkoo.pickerview.view.TimePickerView; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tenlionsoft.baselib.R; import java.text.SimpleDateFormat; diff --git a/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/CenterInputView.java b/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/CenterInputView.java index 7c96bc9..5e7e22d 100755 --- a/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/CenterInputView.java +++ b/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/CenterInputView.java @@ -18,7 +18,7 @@ import android.widget.TextView; import com.bigkoo.pickerview.builder.TimePickerBuilder; import com.bigkoo.pickerview.view.TimePickerView; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tenlionsoft.baselib.R; import java.text.SimpleDateFormat; diff --git a/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/CenterInputViewBase.java b/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/CenterInputViewBase.java index 6fbcadf..feea778 100755 --- a/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/CenterInputViewBase.java +++ b/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/CenterInputViewBase.java @@ -15,7 +15,7 @@ import android.view.inputmethod.InputMethodManager; import android.widget.EditText; import com.bigkoo.pickerview.view.TimePickerView; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tenlionsoft.baselib.R; import java.text.SimpleDateFormat; diff --git a/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/CenterTextAndInputView.java b/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/CenterTextAndInputView.java index 780a61a..cb96898 100755 --- a/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/CenterTextAndInputView.java +++ b/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/CenterTextAndInputView.java @@ -15,7 +15,7 @@ import android.view.inputmethod.InputMethodManager; import android.widget.EditText; import android.widget.TextView; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tenlionsoft.baselib.R; diff --git a/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/CenterTimeAndIntputView.java b/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/CenterTimeAndIntputView.java index 411390d..9515b98 100755 --- a/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/CenterTimeAndIntputView.java +++ b/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/CenterTimeAndIntputView.java @@ -22,7 +22,7 @@ import com.bigkoo.pickerview.builder.OptionsPickerBuilder; import com.bigkoo.pickerview.builder.TimePickerBuilder; import com.bigkoo.pickerview.view.OptionsPickerView; import com.bigkoo.pickerview.view.TimePickerView; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tenlionsoft.baselib.R; import com.tenlionsoft.baselib.constant.PathConfig; import com.tenlionsoft.baselib.core.beans.AreaBean; diff --git a/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/ChangePwdDialog.java b/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/ChangePwdDialog.java index 1764993..bf02cb1 100755 --- a/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/ChangePwdDialog.java +++ b/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/ChangePwdDialog.java @@ -21,7 +21,7 @@ import android.widget.EditText; import android.widget.ImageView; import android.widget.TextView; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tenlionsoft.baselib.R; import com.tenlionsoft.baselib.constant.PathConfig; diff --git a/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/CorrectionDialog.java b/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/CorrectionDialog.java index 9972e5e..facbb2e 100755 --- a/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/CorrectionDialog.java +++ b/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/CorrectionDialog.java @@ -15,7 +15,7 @@ import android.view.WindowManager; import android.view.inputmethod.InputMethodManager; import android.widget.EditText; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tenlionsoft.baselib.R; import androidx.appcompat.widget.AppCompatRatingBar; diff --git a/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/LimitEmojiEditText.java b/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/LimitEmojiEditText.java index 2750a90..a97a662 100644 --- a/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/LimitEmojiEditText.java +++ b/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/LimitEmojiEditText.java @@ -7,7 +7,7 @@ import android.util.AttributeSet; import android.view.inputmethod.EditorInfo; import android.widget.EditText; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tenlionsoft.baselib.R; import com.tenlionsoft.baselib.utils.LogUtils; diff --git a/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/SearchPersonDialogView.java b/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/SearchPersonDialogView.java index e02a051..96786f5 100755 --- a/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/SearchPersonDialogView.java +++ b/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/SearchPersonDialogView.java @@ -20,7 +20,7 @@ import android.widget.TextView; import com.bigkoo.pickerview.builder.OptionsPickerBuilder; import com.bigkoo.pickerview.view.OptionsPickerView; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tenlionsoft.baselib.R; import com.tenlionsoft.baselib.core.beans.DictionaryBean; import com.tenlionsoft.baselib.core.beans.PersonSearchBean; diff --git a/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/TypeBoldTextView.java b/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/TypeBoldTextView.java index 684798e..31e8967 100644 --- a/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/TypeBoldTextView.java +++ b/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/TypeBoldTextView.java @@ -1,12 +1,14 @@ package com.tenlionsoft.baselib.core.widget.views; import android.content.Context; -import android.graphics.Typeface; +import android.content.res.TypedArray; import android.text.TextPaint; import android.util.AttributeSet; import androidx.annotation.Nullable; +import com.tenlionsoft.baselib.R; + /** * 作者: adam * 日期: 2020/6/3 - 4:58 PM @@ -25,7 +27,11 @@ public class TypeBoldTextView extends androidx.appcompat.widget.AppCompatTextVie public TypeBoldTextView(Context context, @Nullable AttributeSet attrs, int defStyleAttr) { super(context, attrs, defStyleAttr); - setTextBold(); + TypedArray a = context.getTheme().obtainStyledAttributes(attrs, R.styleable.TypeBoldTextView, defStyleAttr, 0); + int type = a.getInteger(R.styleable.TypeBoldTextView_txt_is_bold, 0); + if (type == 0) { + setTextBold(); + } } private void setTextBold() { diff --git a/baselib/src/main/java/com/tenlionsoft/baselib/utils/ExceptionHandler.java b/baselib/src/main/java/com/tenlionsoft/baselib/utils/ExceptionHandler.java index 8512cf3..d25f4af 100755 --- a/baselib/src/main/java/com/tenlionsoft/baselib/utils/ExceptionHandler.java +++ b/baselib/src/main/java/com/tenlionsoft/baselib/utils/ExceptionHandler.java @@ -4,7 +4,6 @@ import android.text.TextUtils; import com.google.gson.Gson; import com.google.gson.JsonParseException; -import com.hjq.toast.ToastUtils; import com.tenlionsoft.baselib.core.beans.ErrorBean; import java.net.SocketTimeoutException; @@ -22,16 +21,23 @@ public class ExceptionHandler { public static void handleException(Throwable throwable) { if (throwable instanceof HttpException) { HttpException ex = (HttpException) throwable; + ex.printStackTrace(); try { String errBody = ex.response().errorBody().string(); + LogUtils.e(ex.getMessage()); + LogUtils.e(errBody); if (!TextUtils.isEmpty(errBody)) { ErrorBean errorBean = new Gson().fromJson(errBody, ErrorBean.class); if (!TextUtils.isEmpty(errorBean.getMsg())) { ToastUtils.show(errorBean.getMsg() + "(" + errorBean.getCode() + ")"); } else if (!TextUtils.isEmpty(errorBean.getMessage())) { ToastUtils.show(errorBean.getMessage() + "(" + errorBean.getCode() + ")"); + } else if (errBody.contains("404")) { + ToastUtils.show("无法连接到服务器,请检查网络连接后再试(404)"); + } else if (errBody.contains("500")) { + ToastUtils.show("服务器发生错误(500)"); } else { - ToastUtils.show("网络错误,请稍后重试" + "(" + errorBean.getCode() + ")"); + ToastUtils.show("服务器发生错误"); } } } catch (Exception e1) { diff --git a/baselib/src/main/java/com/tenlionsoft/baselib/utils/TimeUtils.java b/baselib/src/main/java/com/tenlionsoft/baselib/utils/TimeUtils.java index 79aac83..aa9d3af 100755 --- a/baselib/src/main/java/com/tenlionsoft/baselib/utils/TimeUtils.java +++ b/baselib/src/main/java/com/tenlionsoft/baselib/utils/TimeUtils.java @@ -89,6 +89,7 @@ public final class TimeUtils { } return result; } + public static int getMonthDay(String time) { SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd"); try { @@ -107,6 +108,7 @@ public final class TimeUtils { SimpleDateFormat format = new SimpleDateFormat("yyyy"); return format.format(date); } + public static int getDayOfString(String time) { SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd"); try { @@ -120,6 +122,7 @@ public final class TimeUtils { return -1; } } + /** * Milliseconds to the formatted time string. * @@ -130,6 +133,7 @@ public final class TimeUtils { public static String millis2String(final long millis, @NonNull final DateFormat format) { return format.format(new Date(millis)); } + /** * 获取某年某月的最后天 * @@ -144,6 +148,7 @@ public final class TimeUtils { int dayOfMonth = cal.getActualMaximum(Calendar.DATE); return dayOfMonth; } + /** * Formatted time string to the milliseconds. *

The pattern is {@code yyyy-MM-dd HH:mm:ss}.

@@ -160,6 +165,7 @@ public final class TimeUtils { SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); return format.format(date); } + public static String dateToStringMonth(final Date date) { SimpleDateFormat format = new SimpleDateFormat("MM"); return format.format(date); @@ -171,6 +177,12 @@ public final class TimeUtils { return format.format(date); } + public static String getCurrentChineseDate() { + Date date = new Date(); + SimpleDateFormat format = new SimpleDateFormat("yyyy年MM月dd日"); + return format.format(date); + } + public static String getCurrentMonth() { Date date = new Date(); SimpleDateFormat format = new SimpleDateFormat("yyyy-MM"); @@ -1802,7 +1814,7 @@ public final class TimeUtils { } private static final String[] CHINESE_ZODIAC = - {"猴", "鸡", "狗", "猪", "鼠", "牛", "虎", "兔", "龙", "蛇", "马", "羊"}; + {"猴", "鸡", "狗", "猪", "鼠", "牛", "虎", "兔", "龙", "蛇", "马", "羊"}; /** * Return the Chinese zodiac. @@ -1860,8 +1872,8 @@ public final class TimeUtils { private static final int[] ZODIAC_FLAGS = {20, 19, 21, 21, 21, 22, 23, 23, 23, 24, 23, 22}; private static final String[] ZODIAC = { - "水瓶座", "双鱼座", "白羊座", "金牛座", "双子座", "巨蟹座", - "狮子座", "处女座", "天秤座", "天蝎座", "射手座", "魔羯座" + "水瓶座", "双鱼座", "白羊座", "金牛座", "双子座", "巨蟹座", + "狮子座", "处女座", "天秤座", "天蝎座", "射手座", "魔羯座" }; /** @@ -1919,8 +1931,8 @@ public final class TimeUtils { */ public static String getZodiac(final int month, final int day) { return ZODIAC[day >= ZODIAC_FLAGS[month - 1] - ? month - 1 - : (month + 10) % 12]; + ? month - 1 + : (month + 10) % 12]; } private static long timeSpan2Millis(final long timeSpan, diff --git a/baselib/src/main/java/com/tenlionsoft/baselib/utils/ToastUtils.java b/baselib/src/main/java/com/tenlionsoft/baselib/utils/ToastUtils.java new file mode 100644 index 0000000..ab113f3 --- /dev/null +++ b/baselib/src/main/java/com/tenlionsoft/baselib/utils/ToastUtils.java @@ -0,0 +1,17 @@ +package com.tenlionsoft.baselib.utils; + +import com.hjq.toast.Toaster; + +public class ToastUtils { + public static void show(String content) { + Toaster.show(content); + } + + public static void show(int content) { + Toaster.show(content); + } + + public static void showLong(String content) { + Toaster.showLong(content); + } +} diff --git a/commonmodule/src/main/res/drawable-xhdpi/ic_arrow_sort_gray.png b/baselib/src/main/res/drawable-xhdpi/ic_arrow_sort_gray.png similarity index 100% rename from commonmodule/src/main/res/drawable-xhdpi/ic_arrow_sort_gray.png rename to baselib/src/main/res/drawable-xhdpi/ic_arrow_sort_gray.png diff --git a/baselib/src/main/res/layout/base_activity.xml b/baselib/src/main/res/layout/base_activity.xml index dbc3320..e42a1de 100755 --- a/baselib/src/main/res/layout/base_activity.xml +++ b/baselib/src/main/res/layout/base_activity.xml @@ -194,7 +194,7 @@ android:background="@null" android:drawableLeft="@drawable/ic_search_icon_gray" android:drawablePadding="5dp" - android:hint="请输入查询的内容" + android:hint="请输入查询的关键字" android:imeOptions="actionSearch" android:padding="8dp" android:singleLine="true" diff --git a/baselib/src/main/res/layout/item_search.xml b/baselib/src/main/res/layout/item_search.xml index 8f7e396..59ed4f1 100644 --- a/baselib/src/main/res/layout/item_search.xml +++ b/baselib/src/main/res/layout/item_search.xml @@ -29,8 +29,10 @@ android:gravity="left|center" android:hint="请输入人员身份证号码" android:inputType="text" + android:imeOptions="actionSearch" android:paddingLeft="5dp" android:textColor="@color/black" + android:maxLines="1" android:textSize="12sp" tools:text="" /> diff --git a/baselib/src/main/res/values-v26/style.xml b/baselib/src/main/res/values-v26/style.xml index a81080c..baf32be 100644 --- a/baselib/src/main/res/values-v26/style.xml +++ b/baselib/src/main/res/values-v26/style.xml @@ -508,7 +508,7 @@ wrap_content 1 5dp - @drawable/ic_arrow_gray_down + @drawable/ic_arrow_sort_gray right 5dp center_vertical diff --git a/baselib/src/main/res/values-v27/style.xml b/baselib/src/main/res/values-v27/style.xml index e9b484d..9a0a4cb 100644 --- a/baselib/src/main/res/values-v27/style.xml +++ b/baselib/src/main/res/values-v27/style.xml @@ -508,7 +508,7 @@ wrap_content 1 5dp - @drawable/ic_arrow_gray_down + @drawable/ic_arrow_sort_gray right 5dp center_vertical diff --git a/baselib/src/main/res/values/attrs.xml b/baselib/src/main/res/values/attrs.xml index 8519353..93c4f4e 100755 --- a/baselib/src/main/res/values/attrs.xml +++ b/baselib/src/main/res/values/attrs.xml @@ -21,6 +21,7 @@ + @@ -32,6 +33,11 @@ + + + + + @@ -187,7 +193,7 @@ - - + + \ No newline at end of file diff --git a/baselib/src/main/res/values/styles.xml b/baselib/src/main/res/values/styles.xml index ef587b8..05d65e9 100755 --- a/baselib/src/main/res/values/styles.xml +++ b/baselib/src/main/res/values/styles.xml @@ -522,7 +522,7 @@ wrap_content 1 5dp - @drawable/ic_arrow_gray_down + @drawable/ic_arrow_sort_gray right 5dp center_vertical diff --git a/chatmodule/src/main/java/com/tengshisoft/chatmodule/activity/AddressListActivity.java b/chatmodule/src/main/java/com/tengshisoft/chatmodule/activity/AddressListActivity.java index 8315992..dbef1c9 100644 --- a/chatmodule/src/main/java/com/tengshisoft/chatmodule/activity/AddressListActivity.java +++ b/chatmodule/src/main/java/com/tengshisoft/chatmodule/activity/AddressListActivity.java @@ -15,7 +15,7 @@ import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; import com.github.promeg.pinyinhelper.Pinyin; import com.gyf.immersionbar.ImmersionBar; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.chatmodule.R; import com.tengshisoft.chatmodule.R2; import com.tengshisoft.chatmodule.fragments.OftenContactFragment; diff --git a/chatmodule/src/main/java/com/tengshisoft/chatmodule/activity/AddressListSearchActivity.java b/chatmodule/src/main/java/com/tengshisoft/chatmodule/activity/AddressListSearchActivity.java index 9444f12..f7832d6 100644 --- a/chatmodule/src/main/java/com/tengshisoft/chatmodule/activity/AddressListSearchActivity.java +++ b/chatmodule/src/main/java/com/tengshisoft/chatmodule/activity/AddressListSearchActivity.java @@ -11,7 +11,7 @@ import android.widget.ProgressBar; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; import com.gyf.immersionbar.ImmersionBar; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.scwang.smart.refresh.layout.SmartRefreshLayout; import com.tengshisoft.chatmodule.R; import com.tengshisoft.chatmodule.R2; diff --git a/chatmodule/src/main/java/com/tengshisoft/chatmodule/activity/AddressUserDetailActivity.java b/chatmodule/src/main/java/com/tengshisoft/chatmodule/activity/AddressUserDetailActivity.java index 1b54611..504c50b 100644 --- a/chatmodule/src/main/java/com/tengshisoft/chatmodule/activity/AddressUserDetailActivity.java +++ b/chatmodule/src/main/java/com/tengshisoft/chatmodule/activity/AddressUserDetailActivity.java @@ -18,7 +18,7 @@ import android.widget.TextView; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.huawei.ecterminalsdk.base.TsdkCallInfo; import com.huawei.ecterminalsdk.models.TsdkCommonResult; import com.huawei.ecterminalsdk.models.call.TsdkCall; diff --git a/chatmodule/src/main/java/com/tengshisoft/chatmodule/activity/CallSingleActivity.java b/chatmodule/src/main/java/com/tengshisoft/chatmodule/activity/CallSingleActivity.java index e3df9cc..7a22400 100644 --- a/chatmodule/src/main/java/com/tengshisoft/chatmodule/activity/CallSingleActivity.java +++ b/chatmodule/src/main/java/com/tengshisoft/chatmodule/activity/CallSingleActivity.java @@ -8,7 +8,7 @@ import android.view.WindowManager; import com.alibaba.android.arouter.facade.annotation.Route; import com.gyf.immersionbar.ImmersionBar; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.chatmodule.CallSessionCallback; import com.tengshisoft.chatmodule.R; import com.tengshisoft.chatmodule.beans.EnumType; diff --git a/chatmodule/src/main/java/com/tengshisoft/chatmodule/activity/ChatActivity.java b/chatmodule/src/main/java/com/tengshisoft/chatmodule/activity/ChatActivity.java index 94e5a4e..661ab78 100644 --- a/chatmodule/src/main/java/com/tengshisoft/chatmodule/activity/ChatActivity.java +++ b/chatmodule/src/main/java/com/tengshisoft/chatmodule/activity/ChatActivity.java @@ -22,7 +22,7 @@ import android.widget.TextView; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.huawei.ecterminalsdk.base.TsdkCallInfo; import com.huawei.ecterminalsdk.models.TsdkCommonResult; import com.huawei.ecterminalsdk.models.call.TsdkCall; diff --git a/chatmodule/src/main/java/com/tengshisoft/chatmodule/activity/InvitedPointCallActivity.java b/chatmodule/src/main/java/com/tengshisoft/chatmodule/activity/InvitedPointCallActivity.java index 61dd06a..6971fa8 100644 --- a/chatmodule/src/main/java/com/tengshisoft/chatmodule/activity/InvitedPointCallActivity.java +++ b/chatmodule/src/main/java/com/tengshisoft/chatmodule/activity/InvitedPointCallActivity.java @@ -22,7 +22,7 @@ import android.widget.TextView; import com.allen.library.SuperTextView; import com.bigkoo.pickerview.builder.OptionsPickerBuilder; import com.bigkoo.pickerview.view.OptionsPickerView; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.huawei.ecterminalsdk.base.TsdkConfRole; import com.huawei.ecterminalsdk.base.TsdkLdapContactsInfo; import com.huawei.ecterminalsdk.base.TsdkMobileAuidoRoute; diff --git a/chatmodule/src/main/java/com/tengshisoft/chatmodule/activity/ParticipantsActivityV2.java b/chatmodule/src/main/java/com/tengshisoft/chatmodule/activity/ParticipantsActivityV2.java index 20b213e..28b46b3 100644 --- a/chatmodule/src/main/java/com/tengshisoft/chatmodule/activity/ParticipantsActivityV2.java +++ b/chatmodule/src/main/java/com/tengshisoft/chatmodule/activity/ParticipantsActivityV2.java @@ -17,7 +17,7 @@ import android.widget.LinearLayout; import android.widget.TextView; import com.google.android.material.bottomsheet.BottomSheetDialog; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.huawei.ecterminalsdk.base.TsdkConfAttendeeInfo; import com.huawei.ecterminalsdk.base.TsdkConfSpeaker; import com.huawei.ecterminalsdk.base.TsdkConfTerminalType; diff --git a/chatmodule/src/main/java/com/tengshisoft/chatmodule/activity/SponsorMeetingActivity.java b/chatmodule/src/main/java/com/tengshisoft/chatmodule/activity/SponsorMeetingActivity.java index e9ae3b4..c378de9 100644 --- a/chatmodule/src/main/java/com/tengshisoft/chatmodule/activity/SponsorMeetingActivity.java +++ b/chatmodule/src/main/java/com/tengshisoft/chatmodule/activity/SponsorMeetingActivity.java @@ -31,7 +31,7 @@ import android.widget.TextView; import com.bigkoo.pickerview.builder.OptionsPickerBuilder; import com.bigkoo.pickerview.view.OptionsPickerView; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.huawei.ecterminalsdk.base.TsdkConfRole; import com.huawei.ecterminalsdk.base.TsdkMobileAuidoRoute; import com.huawei.ecterminalsdk.base.TsdkNotifyHandUpAttendee; diff --git a/chatmodule/src/main/java/com/tengshisoft/chatmodule/hwclud/manager/LoginMangerV2.java b/chatmodule/src/main/java/com/tengshisoft/chatmodule/hwclud/manager/LoginMangerV2.java index bc188c1..97079fe 100644 --- a/chatmodule/src/main/java/com/tengshisoft/chatmodule/hwclud/manager/LoginMangerV2.java +++ b/chatmodule/src/main/java/com/tengshisoft/chatmodule/hwclud/manager/LoginMangerV2.java @@ -4,7 +4,7 @@ package com.tengshisoft.chatmodule.hwclud.manager; import android.os.Build; import android.text.TextUtils; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.huawei.ecterminalsdk.base.TsdkAuthType; import com.huawei.ecterminalsdk.base.TsdkFailedInfo; import com.huawei.ecterminalsdk.base.TsdkForceLogoutInfo; diff --git a/chatmodule/src/main/java/com/tengshisoft/chatmodule/hwclud/serivce/AuxSendService.java b/chatmodule/src/main/java/com/tengshisoft/chatmodule/hwclud/serivce/AuxSendService.java index 5a6953d..c93f1de 100644 --- a/chatmodule/src/main/java/com/tengshisoft/chatmodule/hwclud/serivce/AuxSendService.java +++ b/chatmodule/src/main/java/com/tengshisoft/chatmodule/hwclud/serivce/AuxSendService.java @@ -20,7 +20,7 @@ import android.view.ViewConfiguration; import android.view.WindowManager; import android.widget.LinearLayout; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.huawei.ecterminalsdk.models.call.TsdkCall; import com.tengshisoft.chatmodule.R; import com.tengshisoft.chatmodule.activity.SponsorMeetingActivity; diff --git a/chatmodule/src/main/java/com/tengshisoft/chatmodule/hwclud/serivce/FloatingViewService.java b/chatmodule/src/main/java/com/tengshisoft/chatmodule/hwclud/serivce/FloatingViewService.java index 2d861b9..233d04b 100644 --- a/chatmodule/src/main/java/com/tengshisoft/chatmodule/hwclud/serivce/FloatingViewService.java +++ b/chatmodule/src/main/java/com/tengshisoft/chatmodule/hwclud/serivce/FloatingViewService.java @@ -17,7 +17,7 @@ import android.widget.Chronometer; import android.widget.FrameLayout; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.chatmodule.R; import com.tengshisoft.chatmodule.activity.SponsorMeetingActivity; import com.tengshisoft.chatmodule.hwclud.listener.FloatingViewListener; diff --git a/chatmodule/src/main/java/com/tengshisoft/chatmodule/hwclud/serivce/MinimizeService.java b/chatmodule/src/main/java/com/tengshisoft/chatmodule/hwclud/serivce/MinimizeService.java index 7886759..27cacb7 100644 --- a/chatmodule/src/main/java/com/tengshisoft/chatmodule/hwclud/serivce/MinimizeService.java +++ b/chatmodule/src/main/java/com/tengshisoft/chatmodule/hwclud/serivce/MinimizeService.java @@ -20,7 +20,7 @@ import android.view.WindowManager; import android.widget.FrameLayout; import android.widget.TextView; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.huawei.ecterminalsdk.base.TsdkWatchSvcAttendees; import com.huawei.ecterminalsdk.models.call.TsdkCall; import com.tengshisoft.chatmodule.R; diff --git a/chatmodule/src/main/java/com/tengshisoft/chatmodule/hwclud/serivce/ServiceNotifyV2.java b/chatmodule/src/main/java/com/tengshisoft/chatmodule/hwclud/serivce/ServiceNotifyV2.java index 766a82e..a3e8b28 100644 --- a/chatmodule/src/main/java/com/tengshisoft/chatmodule/hwclud/serivce/ServiceNotifyV2.java +++ b/chatmodule/src/main/java/com/tengshisoft/chatmodule/hwclud/serivce/ServiceNotifyV2.java @@ -6,7 +6,7 @@ import android.os.Build; import android.text.TextUtils; import android.util.Log; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.huawei.ecterminalsdk.base.TsdkAttendee; import com.huawei.ecterminalsdk.base.TsdkAudioNetQuality; import com.huawei.ecterminalsdk.base.TsdkAuxTokenOwnerInd; diff --git a/chatmodule/src/main/java/com/tengshisoft/chatmodule/hwclud/ui/AuxMeetingFragment.java b/chatmodule/src/main/java/com/tengshisoft/chatmodule/hwclud/ui/AuxMeetingFragment.java index 1ef0c3a..cdbf42d 100644 --- a/chatmodule/src/main/java/com/tengshisoft/chatmodule/hwclud/ui/AuxMeetingFragment.java +++ b/chatmodule/src/main/java/com/tengshisoft/chatmodule/hwclud/ui/AuxMeetingFragment.java @@ -9,7 +9,7 @@ import android.os.Looper; import android.util.Log; import android.widget.FrameLayout; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.huawei.ecterminalsdk.base.TsdkWatchSvcAttendees; import com.tengshisoft.chatmodule.R; import com.tengshisoft.chatmodule.R2; diff --git a/chatmodule/src/main/java/com/tengshisoft/chatmodule/hwclud/ui/BaseMvpActivityV2.java b/chatmodule/src/main/java/com/tengshisoft/chatmodule/hwclud/ui/BaseMvpActivityV2.java index 476a5c7..f5b2753 100644 --- a/chatmodule/src/main/java/com/tengshisoft/chatmodule/hwclud/ui/BaseMvpActivityV2.java +++ b/chatmodule/src/main/java/com/tengshisoft/chatmodule/hwclud/ui/BaseMvpActivityV2.java @@ -14,7 +14,7 @@ import android.view.View; import android.view.inputmethod.InputMethodManager; import android.widget.EditText; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.chatmodule.R; import com.tengshisoft.chatmodule.activity.ChatActivity; import com.tengshisoft.chatmodule.activity.InvitedPointCallActivity; diff --git a/chatmodule/src/main/java/com/tengshisoft/chatmodule/hwclud/ui/LazyloadFragment.java b/chatmodule/src/main/java/com/tengshisoft/chatmodule/hwclud/ui/LazyloadFragment.java index 512badb..4de1770 100644 --- a/chatmodule/src/main/java/com/tengshisoft/chatmodule/hwclud/ui/LazyloadFragment.java +++ b/chatmodule/src/main/java/com/tengshisoft/chatmodule/hwclud/ui/LazyloadFragment.java @@ -8,7 +8,7 @@ import android.view.View; import android.view.ViewGroup; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.chatmodule.hwclud.listener.OrientationListener; import com.tengshisoft.chatmodule.hwclud.utils.LogUtil; diff --git a/chatmodule/src/main/java/com/tengshisoft/chatmodule/hwclud/ui/SvcVideoFragment.kt b/chatmodule/src/main/java/com/tengshisoft/chatmodule/hwclud/ui/SvcVideoFragment.kt index 82fe854..dbb5fba 100644 --- a/chatmodule/src/main/java/com/tengshisoft/chatmodule/hwclud/ui/SvcVideoFragment.kt +++ b/chatmodule/src/main/java/com/tengshisoft/chatmodule/hwclud/ui/SvcVideoFragment.kt @@ -7,7 +7,7 @@ import android.view.ViewGroup import android.widget.FrameLayout import android.widget.RelativeLayout import androidx.annotation.RequiresApi -import com.hjq.toast.ToastUtils +import com.tenlionsoft.baselib.utils.ToastUtils import com.huawei.ecterminalsdk.base.TsdkConfSpeakerInfo import com.huawei.ecterminalsdk.base.TsdkWatchSvcAttendees import com.tengshisoft.chatmodule.R diff --git a/chatmodule/src/main/java/com/tengshisoft/chatmodule/hwclud/utils/HuaweiUtils.java b/chatmodule/src/main/java/com/tengshisoft/chatmodule/hwclud/utils/HuaweiUtils.java index 0357504..68d8d85 100644 --- a/chatmodule/src/main/java/com/tengshisoft/chatmodule/hwclud/utils/HuaweiUtils.java +++ b/chatmodule/src/main/java/com/tengshisoft/chatmodule/hwclud/utils/HuaweiUtils.java @@ -14,7 +14,7 @@ import android.os.Build; import android.util.Log; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import java.lang.reflect.Method; diff --git a/chatmodule/src/main/java/com/tengshisoft/chatmodule/hwclud/utils/PhoneUtil.java b/chatmodule/src/main/java/com/tengshisoft/chatmodule/hwclud/utils/PhoneUtil.java index aaacf6d..4a03a62 100644 --- a/chatmodule/src/main/java/com/tengshisoft/chatmodule/hwclud/utils/PhoneUtil.java +++ b/chatmodule/src/main/java/com/tengshisoft/chatmodule/hwclud/utils/PhoneUtil.java @@ -9,7 +9,7 @@ import android.provider.Settings; import android.telephony.TelephonyManager; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.chatmodule.R; import com.tenlionsoft.baselib.app.BaseAppContext; diff --git a/chatmodule/src/main/java/com/tengshisoft/chatmodule/hwclud/utils/UIUtil.java b/chatmodule/src/main/java/com/tengshisoft/chatmodule/hwclud/utils/UIUtil.java index 7fdec07..901c91d 100644 --- a/chatmodule/src/main/java/com/tengshisoft/chatmodule/hwclud/utils/UIUtil.java +++ b/chatmodule/src/main/java/com/tengshisoft/chatmodule/hwclud/utils/UIUtil.java @@ -40,7 +40,7 @@ import android.widget.Spinner; import android.widget.SpinnerAdapter; import android.widget.TextView; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.chatmodule.R; import com.tenlionsoft.baselib.app.BaseAppContext; import com.tenlionsoft.baselib.core.beans.Member; diff --git a/chatmodule/src/main/java/com/tengshisoft/chatmodule/keeplive/services/VoipReceiver.java b/chatmodule/src/main/java/com/tengshisoft/chatmodule/keeplive/services/VoipReceiver.java index d5f10d2..6ddfe34 100644 --- a/chatmodule/src/main/java/com/tengshisoft/chatmodule/keeplive/services/VoipReceiver.java +++ b/chatmodule/src/main/java/com/tengshisoft/chatmodule/keeplive/services/VoipReceiver.java @@ -6,7 +6,7 @@ import android.content.Intent; import android.media.AsyncPlayer; import android.util.Log; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import java.util.ArrayList; diff --git a/commonmodule/src/main/AndroidManifest.xml b/commonmodule/src/main/AndroidManifest.xml index 9ed2fb8..7eafcf2 100644 --- a/commonmodule/src/main/AndroidManifest.xml +++ b/commonmodule/src/main/AndroidManifest.xml @@ -3,6 +3,18 @@ package="com.tengshisoft.commonmodule"> + + >() { + RetrofitManager.getInstance() + .create(GridApis.class) + .getCaseTypeListAll(UserLgUtils.getToken()) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(new Observer>() { @Override public void onSubscribe(@NonNull Disposable d) { diff --git a/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/cases/IncidentReturnRecordActivity.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/cases/IncidentReturnRecordActivity.java index 4fde9c0..c839bca 100644 --- a/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/cases/IncidentReturnRecordActivity.java +++ b/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/cases/IncidentReturnRecordActivity.java @@ -6,7 +6,7 @@ import android.view.View; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.scwang.smart.refresh.layout.SmartRefreshLayout; import com.tengshisoft.commonmodule.R; import com.tengshisoft.commonmodule.R2; diff --git a/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/cases/IncidentReturnRecordAddActivity.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/cases/IncidentReturnRecordAddActivity.java index 0dac0bd..8737789 100644 --- a/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/cases/IncidentReturnRecordAddActivity.java +++ b/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/cases/IncidentReturnRecordAddActivity.java @@ -15,7 +15,7 @@ import com.bigkoo.pickerview.builder.TimePickerBuilder; import com.bigkoo.pickerview.view.OptionsPickerView; import com.bigkoo.pickerview.view.TimePickerView; import com.google.gson.Gson; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.R; import com.tengshisoft.commonmodule.R2; import com.tengshisoft.commonmodule.beans.SaveFloatingBean; diff --git a/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/cases/IncidentSpecialActivity.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/cases/IncidentSpecialActivity.java index cb1dfe3..4dace59 100644 --- a/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/cases/IncidentSpecialActivity.java +++ b/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/cases/IncidentSpecialActivity.java @@ -5,7 +5,7 @@ import android.view.View; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.R; import com.tengshisoft.commonmodule.R2; import com.tenlionsoft.baselib.constant.PathConfig; diff --git a/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/cases/IncidentSpecialDeptActivity.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/cases/IncidentSpecialDeptActivity.java index 0a66ec7..69de246 100644 --- a/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/cases/IncidentSpecialDeptActivity.java +++ b/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/cases/IncidentSpecialDeptActivity.java @@ -5,7 +5,7 @@ import android.view.View; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.R; import com.tengshisoft.commonmodule.R2; import com.tenlionsoft.baselib.constant.PathConfig; diff --git a/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/cases/TaskConverIncidentReportActivity.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/cases/TaskConverIncidentReportActivity.java index c8e9638..402eddb 100644 --- a/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/cases/TaskConverIncidentReportActivity.java +++ b/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/cases/TaskConverIncidentReportActivity.java @@ -33,7 +33,7 @@ import com.bigkoo.pickerview.view.TimePickerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.google.gson.Gson; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.R; import com.tengshisoft.commonmodule.R2; import com.tengshisoft.commonmodule.beans.AreaGridListBean; diff --git a/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/checkwork/AttendanceActivity.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/checkwork/AttendanceActivity.java index 6186df0..9adee4b 100644 --- a/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/checkwork/AttendanceActivity.java +++ b/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/checkwork/AttendanceActivity.java @@ -31,7 +31,7 @@ import com.baidu.mapapi.model.LatLng; import com.bumptech.glide.Glide; import com.bumptech.glide.load.resource.bitmap.CircleCrop; import com.bumptech.glide.request.RequestOptions; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.R; import com.tengshisoft.commonmodule.R2; import com.tengshisoft.commonmodule.beans.UserGridList; diff --git a/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/department/BindGridActivity.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/department/BindGridActivity.java index 5977514..9e3d248 100644 --- a/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/department/BindGridActivity.java +++ b/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/department/BindGridActivity.java @@ -9,7 +9,7 @@ import android.widget.ProgressBar; import android.widget.TextView; import com.alibaba.android.arouter.facade.annotation.Route; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.scwang.smart.refresh.layout.SmartRefreshLayout; import com.tengshisoft.commonmodule.R; import com.tengshisoft.commonmodule.R2; diff --git a/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/department/ChooseDeptActivity.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/department/ChooseDeptActivity.java index 24d3d8c..a4ef4e2 100644 --- a/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/department/ChooseDeptActivity.java +++ b/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/department/ChooseDeptActivity.java @@ -11,7 +11,7 @@ import com.alibaba.android.arouter.facade.annotation.Route; import com.google.android.flexbox.FlexDirection; import com.google.android.flexbox.FlexWrap; import com.google.android.flexbox.FlexboxLayoutManager; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.scwang.smart.refresh.layout.SmartRefreshLayout; import com.tengshisoft.commonmodule.R; import com.tengshisoft.commonmodule.R2; diff --git a/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/department/ChooseDeptKnowLedgeActivity.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/department/ChooseDeptKnowLedgeActivity.java index 4118b71..5156560 100644 --- a/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/department/ChooseDeptKnowLedgeActivity.java +++ b/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/department/ChooseDeptKnowLedgeActivity.java @@ -11,7 +11,7 @@ import com.alibaba.android.arouter.facade.annotation.Route; import com.google.android.flexbox.FlexDirection; import com.google.android.flexbox.FlexWrap; import com.google.android.flexbox.FlexboxLayoutManager; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.scwang.smart.refresh.layout.SmartRefreshLayout; import com.tengshisoft.commonmodule.R; import com.tengshisoft.commonmodule.R2; diff --git a/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/department/ChooseDeptUserActivity.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/department/ChooseDeptUserActivity.java index f5b3618..fe687c2 100644 --- a/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/department/ChooseDeptUserActivity.java +++ b/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/department/ChooseDeptUserActivity.java @@ -10,7 +10,7 @@ import com.alibaba.android.arouter.facade.annotation.Route; import com.google.android.flexbox.FlexDirection; import com.google.android.flexbox.FlexWrap; import com.google.android.flexbox.FlexboxLayoutManager; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.scwang.smart.refresh.layout.SmartRefreshLayout; import com.tengshisoft.commonmodule.R; import com.tengshisoft.commonmodule.R2; diff --git a/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/department/ChooseGridActivity.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/department/ChooseGridActivity.java index 84cec06..34bf52b 100644 --- a/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/department/ChooseGridActivity.java +++ b/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/department/ChooseGridActivity.java @@ -12,7 +12,7 @@ import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; import com.alibaba.android.arouter.facade.annotation.Route; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.scwang.smart.refresh.layout.SmartRefreshLayout; import com.tengshisoft.commonmodule.R; import com.tengshisoft.commonmodule.R2; diff --git a/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/department/ChooseOrgAreaActivity.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/department/ChooseOrgAreaActivity.java index 8183694..40d98df 100644 --- a/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/department/ChooseOrgAreaActivity.java +++ b/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/department/ChooseOrgAreaActivity.java @@ -10,7 +10,7 @@ import com.alibaba.android.arouter.facade.annotation.Route; import com.google.android.flexbox.FlexDirection; import com.google.android.flexbox.FlexWrap; import com.google.android.flexbox.FlexboxLayoutManager; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.scwang.smart.refresh.layout.SmartRefreshLayout; import com.tengshisoft.commonmodule.R; import com.tengshisoft.commonmodule.R2; diff --git a/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/department/ChoosePersonActivity.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/department/ChoosePersonActivity.java index d9f54fc..f068a09 100644 --- a/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/department/ChoosePersonActivity.java +++ b/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/department/ChoosePersonActivity.java @@ -12,7 +12,7 @@ import android.widget.ProgressBar; import android.widget.TextView; import com.alibaba.android.arouter.facade.annotation.Route; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.scwang.smart.refresh.layout.SmartRefreshLayout; import com.tengshisoft.commonmodule.R; import com.tengshisoft.commonmodule.R2; diff --git a/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/journal/JournalDetailActivity.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/journal/JournalDetailActivity.java index 17bf897..43f67cf 100644 --- a/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/journal/JournalDetailActivity.java +++ b/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/journal/JournalDetailActivity.java @@ -15,7 +15,7 @@ import androidx.recyclerview.widget.RecyclerView; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.scwang.smart.refresh.layout.SmartRefreshLayout; import com.tengshisoft.commonmodule.R; import com.tengshisoft.commonmodule.R2; diff --git a/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/journal/JournalEditActivity.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/journal/JournalEditActivity.java index e82dda3..9cd70b5 100644 --- a/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/journal/JournalEditActivity.java +++ b/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/journal/JournalEditActivity.java @@ -26,7 +26,7 @@ import com.bigkoo.pickerview.builder.TimePickerBuilder; import com.bigkoo.pickerview.view.OptionsPickerView; import com.bigkoo.pickerview.view.TimePickerView; import com.google.gson.Gson; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.R; import com.tengshisoft.commonmodule.R2; import com.tengshisoft.commonmodule.beans.JournalListBean; diff --git a/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/journal/JournalListActivity.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/journal/JournalListActivity.java index f7e1516..875d505 100644 --- a/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/journal/JournalListActivity.java +++ b/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/journal/JournalListActivity.java @@ -21,7 +21,7 @@ import android.widget.TextView; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; import com.gyf.immersionbar.ImmersionBar; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.scwang.smart.refresh.layout.SmartRefreshLayout; import com.tengshisoft.commonmodule.R; import com.tengshisoft.commonmodule.R2; diff --git a/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/journal/JournalReportActivity.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/journal/JournalReportActivity.java index 808cd86..0b3147f 100644 --- a/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/journal/JournalReportActivity.java +++ b/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/journal/JournalReportActivity.java @@ -25,7 +25,7 @@ import com.bigkoo.pickerview.builder.TimePickerBuilder; import com.bigkoo.pickerview.view.OptionsPickerView; import com.bigkoo.pickerview.view.TimePickerView; import com.google.gson.Gson; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.R; import com.tengshisoft.commonmodule.R2; import com.tengshisoft.commonmodule.beans.SaveJournalBean; diff --git a/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/logs/StatisticsGridActivity.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/logs/StatisticsGridActivity.java index b213306..c3ab2b9 100644 --- a/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/logs/StatisticsGridActivity.java +++ b/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/logs/StatisticsGridActivity.java @@ -17,7 +17,7 @@ import com.github.mikephil.charting.data.BarDataSet; import com.github.mikephil.charting.data.BarEntry; import com.github.mikephil.charting.formatter.LargeValueFormatter; import com.gyf.immersionbar.ImmersionBar; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.R; import com.tengshisoft.commonmodule.R2; import com.tengshisoft.commonmodule.beans.GridStatistCountBean; diff --git a/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/notice/NoticeDetailActivity.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/notice/NoticeDetailActivity.java new file mode 100644 index 0000000..e1e1fc3 --- /dev/null +++ b/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/notice/NoticeDetailActivity.java @@ -0,0 +1,196 @@ +package com.tengshisoft.commonmodule.activitys.notice; + +import android.net.http.SslError; +import android.os.Build; +import android.text.TextUtils; +import android.webkit.HttpAuthHandler; +import android.webkit.JsResult; +import android.webkit.SslErrorHandler; +import android.webkit.WebChromeClient; +import android.webkit.WebSettings; +import android.webkit.WebView; +import android.webkit.WebViewClient; +import android.widget.LinearLayout; +import android.widget.TextView; + +import com.alibaba.android.arouter.facade.annotation.Route; +import com.tenlionsoft.baselib.utils.ToastUtils; +import com.tengshisoft.commonmodule.R; +import com.tengshisoft.commonmodule.R2; +import com.tengshisoft.commonmodule.beans.NoticeDetailBean; +import com.tengshisoft.commonmodule.nets.GridApis; +import com.tenlionsoft.baselib.constant.PathConfig; +import com.tenlionsoft.baselib.core.retrofit_net.BaseUrlApi; +import com.tenlionsoft.baselib.core.retrofit_net.RetrofitManager; +import com.tenlionsoft.baselib.core.retrofit_net.conver.RxTransformer; +import com.tenlionsoft.baselib.core.widget.base.BaseActivity; +import com.tenlionsoft.baselib.core.widget.views.NestedScrollWebView; +import com.tenlionsoft.baselib.core.widget.views.TypeBoldTextView; +import com.tenlionsoft.baselib.utils.ExceptionHandler; +import com.tenlionsoft.baselib.utils.LogUtils; +import com.tenlionsoft.baselib.utils.UserLgUtils; + +import butterknife.BindView; +import butterknife.ButterKnife; +import butterknife.Unbinder; +import io.reactivex.rxjava3.annotations.NonNull; +import io.reactivex.rxjava3.core.Observer; +import io.reactivex.rxjava3.disposables.Disposable; + +@Route(path = PathConfig.PATH_MODULE_COMMON_ACTIVITY_NOTICE_DETAIL) +public class NoticeDetailActivity extends BaseActivity { + + + @BindView(R2.id.tv_title) + public TypeBoldTextView mTvTitle; + @BindView(R2.id.tv_source) + public TextView mTvSource; + @BindView(R2.id.tv_time) + public TextView mTvTime; + @BindView(R2.id.nsw_web) + public NestedScrollWebView mNswWeb; + private Unbinder mBind; + private String mId; + + @Override + protected int setLayoutId() { + return R.layout.activity_notice_detail; + } + + @Override + public void initData() { + mBind = ButterKnife.bind(this); + refreshView(STATE_LOAD_LOADING); + mTvBaseTitle.setText("详情"); + mId = getIntent().getStringExtra("id"); + if (TextUtils.isEmpty(mId)) { + ToastUtils.show("数据有误"); + finish(); + } else { + getDetailById(mId); + } + } + + /** + * 获取详情 + * + * @param id + */ + + /** + * 获取详情 + */ + private void getDetailById(String id) { + RetrofitManager.getInstance() + .create(GridApis.class) + .getArticleDetail(id, UserLgUtils.getToken()) + .compose(RxTransformer.getTransformer()) + .subscribe(new Observer() { + @Override + public void onSubscribe(@NonNull Disposable d) { + + } + + @Override + public void onNext(@NonNull NoticeDetailBean rowsBean) { + setDataToView(rowsBean); + } + + @Override + public void onError(@NonNull Throwable e) { + refreshView(STATE_LOAD_ERROR); + ExceptionHandler.handleException(e); + } + + @Override + public void onComplete() { + + } + }); + } + + /** + * 回显数据 + */ + private void setDataToView(NoticeDetailBean bean) { + refreshView(STATE_LOAD_SUCCESS); + mTvTitle.setText(bean.getTitle()); + mTvTime.setText(bean.getPublishDate()); + mTvSource.setText(bean.getSource()); + + WebSettings settings = mNswWeb.getSettings(); + settings.setCacheMode(WebSettings.LOAD_DEFAULT); + settings.setAppCacheEnabled(true); + settings.setJavaScriptEnabled(true);//启用JS + settings.setBlockNetworkImage(true);//阻塞页面图片加载 + settings.setDomStorageEnabled(true); + settings.setTextZoom(90); + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { + settings.setMixedContentMode(WebSettings.MIXED_CONTENT_ALWAYS_ALLOW); + } + String newStr = + bean.getContent().replaceAll("route/file/v2/download/true/", BaseUrlApi.BASE_IMG_URL_V2).replaceAll( + "img", "img style='width:100%;height:auto;'"); + bean.setContent(newStr); + LogUtils.e(newStr); + mNswWeb.loadData(bean.getContent(), "text/html", "utf-8"); + + mNswWeb.setWebViewClient(new WebViewClient() { + @Override + public void onReceivedSslError(WebView view, SslErrorHandler handler, SslError error) { + handler.proceed(); + } + + @Override + public void onPageFinished(WebView view, String url) { + super.onPageFinished(view, url); + view.getSettings().setBlockNetworkImage(false);//开启页面图片加载 +// imgReset(); + runOnUiThread(() -> mNswWeb.setLayoutParams(new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT))); + } + + @Override + public void onReceivedHttpAuthRequest(WebView view, HttpAuthHandler handler, String host, String realm) { + super.onReceivedHttpAuthRequest(view, handler, host, realm); + + } + + @Override + public boolean shouldOverrideUrlLoading(WebView view, String url) { + view.loadUrl(url); + return true; + } + }); + mNswWeb.setWebChromeClient(new WebChromeClient() { + @Override + public boolean onJsAlert(WebView view, String url, String message, JsResult result) { + return super.onJsAlert(view, url, message, result); + } + }); + } + + /** + * 对图片进行重置大小，宽度就是手机屏幕宽度，高度根据宽度比便自动缩放 + **/ + private void imgReset() { + mNswWeb.loadUrl("javascript:(function(){" + + "var objs = document.getElementsByTagName('img'); " + + "for(var i=0;i mDatas; + private int mCurrentPage = 1; + private String mKeywords = ""; + private ProgressDialog mDialog; + private NoticeListAdapter mAdapter; + + @Override + protected int setLayoutId() { + return R.layout.activity_notice_list; + } + + @Override + public void initData() { + mBind = ButterKnife.bind(this); + mTvBaseTitle.setText("通知公告"); + ImmersionBar.with(mActivity) + .statusBarColor("#FFFFFF") + .statusBarDarkFont(true) + .titleBar(mRlTitleBar) + .init(); + mTvBaseTitle.setTextColor(Color.BLACK); + mRlTitleBar.setBackgroundColor(getResources().getColor(R.color.white)); + mIvAppSearchIcon.setVisibility(View.GONE); + mTvAppBack.setBackgroundResource(R.drawable.ic_back_black); + refreshView(STATE_LOAD_SUCCESS); + mIvAppSearchIcon.setVisibility(View.VISIBLE); + mDatas = new ArrayList<>(); + mAdapter = new NoticeListAdapter(mActivity, mDatas); + mRlvComponents.setLayoutManager(new LinearLayoutManager(mActivity)); + mRlvComponents.setAdapter(mAdapter); + mRlvComponents.addItemDecoration(new ItemSplitDivider(mActivity, LinearLayoutManager.VERTICAL, 1, + Color.parseColor("#BFBFBF"))); + mSrlContent.setOnRefreshListener(v -> doRefresh()); + mSrlContent.setOnLoadMoreListener(v -> doLoadMore()); + mCsvState.setState(CustomStateView.STATE_LOAD); + mAdapter.addOnItemClickListener(v -> ARouter.getInstance() + .build(PathConfig.PATH_MODULE_COMMON_ACTIVITY_NOTICE_DETAIL) + .withString("id", v.getContentId()) + .navigation()); + mDialog = UIUtil.initDialog(mActivity, "搜索中..."); + doRefresh(); + } + + //加载更多 + private void doLoadMore() { + getNoticeList(mCurrentPage); + } + + + //刷新 + private void doRefresh() { + mCsvState.setState(CustomStateView.STATE_LOAD); + mDatas.clear(); + mAdapter.setData(mDatas); + getNoticeList(1); + } + + private void getNoticeList(int currentPage) { + mCurrentPage = currentPage; + RetrofitManager.getInstance() + .create(GridApis.class) + .getArticleList(mKeywords, PathConfig.NOTICE_CID, mCurrentPage + "", UserLgUtils.getToken()) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(new Observer() { + @Override + public void onSubscribe(@NonNull Disposable d) { + + } + + @Override + public void onNext(@NonNull NoticeListBean communityListBean) { + if (mDialog != null && mDialog.isShowing()) { + mDialog.dismiss(); + } + mSrlContent.finishLoadMore(); + mSrlContent.finishRefresh(); + if (communityListBean.getRows() != null && communityListBean.getRows().size() > 0) { + mCsvState.setState(CustomStateView.STATE_SUCCESS); + ++mCurrentPage; + if (currentPage == 1) { + mDatas.clear(); + mDatas.addAll(communityListBean.getRows()); + } else { + mDatas.addAll(communityListBean.getRows()); + } + mAdapter.setData(mDatas); + if (mDatas.size() >= communityListBean.getTotal()) { + mSrlContent.setNoMoreData(true); + } else { + mSrlContent.setNoMoreData(false); + } + } else { + if (currentPage > 1) { + mSrlContent.setNoMoreData(true); + } else { + mCsvState.setState(CustomStateView.STATE_EMPTY); + if (TextUtils.isEmpty(mKeywords)) { + //无数据 + } else { + ToastUtils.show("未查询到相关内容"); + } + } + } + } + + @Override + public void onError(@NonNull Throwable e) { + if (mDialog != null && mDialog.isShowing()) { + mDialog.dismiss(); + } + mSrlContent.finishLoadMore(); + mSrlContent.finishRefresh(); + ExceptionHandler.handleException(e); + mCsvState.setState(CustomStateView.STATE_ERROR); + } + + @Override + public void onComplete() { + + } + }); + } + + @Override + protected void doSearchByTitle() { + + } + + @Override + protected void clearSearch() { + + } +} \ No newline at end of file diff --git a/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/repository/KnowLedgeAskAddActivity.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/repository/KnowLedgeAskAddActivity.java index da2fb8c..c5f1c6f 100644 --- a/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/repository/KnowLedgeAskAddActivity.java +++ b/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/repository/KnowLedgeAskAddActivity.java @@ -10,7 +10,7 @@ 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.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.R; import com.tengshisoft.commonmodule.R2; import com.tengshisoft.commonmodule.beans.DeptBean; diff --git a/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/repository/KnowLedgeAskDetailActivity.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/repository/KnowLedgeAskDetailActivity.java index 21530d9..6aef8aa 100644 --- a/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/repository/KnowLedgeAskDetailActivity.java +++ b/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/repository/KnowLedgeAskDetailActivity.java @@ -14,7 +14,7 @@ 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.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.R; import com.tengshisoft.commonmodule.R2; import com.tengshisoft.commonmodule.beans.KnowAskDetailBean; diff --git a/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/repository/KnowLedgeDetailActivity.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/repository/KnowLedgeDetailActivity.java index cbdff07..d751970 100644 --- a/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/repository/KnowLedgeDetailActivity.java +++ b/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/repository/KnowLedgeDetailActivity.java @@ -18,7 +18,7 @@ import android.widget.TextView; import com.alibaba.android.arouter.facade.annotation.Route; import com.google.gson.Gson; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.scwang.smart.refresh.layout.SmartRefreshLayout; import com.tengshisoft.commonmodule.R; import com.tengshisoft.commonmodule.R2; diff --git a/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/repository/KnowLedgeListActivity.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/repository/KnowLedgeListActivity.java index 2b50a98..04e2502 100644 --- a/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/repository/KnowLedgeListActivity.java +++ b/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/repository/KnowLedgeListActivity.java @@ -9,7 +9,7 @@ import android.view.View; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; import com.gyf.immersionbar.ImmersionBar; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.R; import com.tengshisoft.commonmodule.R2; import com.tengshisoft.commonmodule.nets.GridApis; diff --git a/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/repository/KnowLedgeManageAddActivity.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/repository/KnowLedgeManageAddActivity.java index b62003a..c0fe958 100644 --- a/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/repository/KnowLedgeManageAddActivity.java +++ b/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/repository/KnowLedgeManageAddActivity.java @@ -13,7 +13,7 @@ import com.alibaba.android.arouter.launcher.ARouter; import com.bigkoo.pickerview.builder.OptionsPickerBuilder; import com.bigkoo.pickerview.view.OptionsPickerView; import com.google.gson.Gson; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.R; import com.tengshisoft.commonmodule.R2; import com.tengshisoft.commonmodule.beans.CaseTypeBean; diff --git a/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/repository/KnowLedgeManageDetailActivity.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/repository/KnowLedgeManageDetailActivity.java index 631f9a6..5d4fa4c 100644 --- a/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/repository/KnowLedgeManageDetailActivity.java +++ b/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/repository/KnowLedgeManageDetailActivity.java @@ -12,7 +12,7 @@ import android.widget.TextView; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.R; import com.tengshisoft.commonmodule.R2; import com.tengshisoft.commonmodule.beans.KnowReportDetailBean; diff --git a/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/repository/KnowLedgeManageListActivity.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/repository/KnowLedgeManageListActivity.java index 338038e..ff557b3 100644 --- a/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/repository/KnowLedgeManageListActivity.java +++ b/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/repository/KnowLedgeManageListActivity.java @@ -6,7 +6,7 @@ import android.view.View; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.scwang.smart.refresh.layout.SmartRefreshLayout; import com.tengshisoft.commonmodule.R; import com.tengshisoft.commonmodule.R2; diff --git a/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/usercenter/ForgetPwdActivity.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/usercenter/ForgetPwdActivity.java index 73aeb88..9fbe580 100644 --- a/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/usercenter/ForgetPwdActivity.java +++ b/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/usercenter/ForgetPwdActivity.java @@ -13,7 +13,7 @@ import android.widget.ImageView; import com.alibaba.android.arouter.facade.annotation.Route; import com.google.gson.Gson; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.R; import com.tengshisoft.commonmodule.R2; import com.tenlionsoft.baselib.constant.PathConfig; diff --git a/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/usercenter/UserCenterActivity.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/usercenter/UserCenterActivity.java index 743c4cc..22a9db1 100644 --- a/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/usercenter/UserCenterActivity.java +++ b/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/usercenter/UserCenterActivity.java @@ -20,7 +20,7 @@ import com.alibaba.android.arouter.facade.annotation.Route; import com.bumptech.glide.Glide; import com.bumptech.glide.load.resource.bitmap.CircleCrop; import com.bumptech.glide.request.RequestOptions; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.R; import com.tengshisoft.commonmodule.R2; import com.tenlionsoft.baselib.constant.BaseConfig; diff --git a/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/usercenter/UserCenterFragment.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/usercenter/UserCenterFragment.java index ea93a4f..bebcd4c 100755 --- a/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/usercenter/UserCenterFragment.java +++ b/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/usercenter/UserCenterFragment.java @@ -26,7 +26,7 @@ import com.bumptech.glide.load.resource.bitmap.CircleCrop; import com.bumptech.glide.request.RequestOptions; import com.github.promeg.pinyinhelper.Pinyin; import com.google.gson.Gson; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.R; import com.tengshisoft.commonmodule.R2; import com.tengshisoft.commonmodule.beans.ChangePwdBean; diff --git a/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/usercenter/UserInfoActivity.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/usercenter/UserInfoActivity.java index a8cfa1f..3428c07 100644 --- a/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/usercenter/UserInfoActivity.java +++ b/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/usercenter/UserInfoActivity.java @@ -14,7 +14,7 @@ import com.bigkoo.pickerview.builder.TimePickerBuilder; import com.bigkoo.pickerview.view.OptionsPickerView; import com.bigkoo.pickerview.view.TimePickerView; import com.google.gson.Gson; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.R; import com.tengshisoft.commonmodule.R2; import com.tengshisoft.commonmodule.beans.SaveUserExpandleInfo; diff --git a/commonmodule/src/main/java/com/tengshisoft/commonmodule/adapters/NoticeListAdapter.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/adapters/NoticeListAdapter.java new file mode 100644 index 0000000..dcd9e02 --- /dev/null +++ b/commonmodule/src/main/java/com/tengshisoft/commonmodule/adapters/NoticeListAdapter.java @@ -0,0 +1,54 @@ +package com.tengshisoft.commonmodule.adapters; + +import android.content.Context; +import android.text.TextUtils; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; + +import com.bumptech.glide.Glide; +import com.tengshisoft.commonmodule.R; +import com.tengshisoft.commonmodule.beans.NoticeListBean; +import com.tengshisoft.commonmodule.holders.NoticeListHolder; +import com.tenlionsoft.baselib.core.retrofit_net.BaseUrlApi; +import com.tenlionsoft.baselib.core.widget.base.BaseRecyclerAdapter; + +import java.util.List; + +/** + * 作者: adam + * 日期: 2021/9/26 - 3:01 下午 + * 邮箱: itgaojian@163.com + * 描述: 通知公告 + */ +public class NoticeListAdapter extends BaseRecyclerAdapter { + + public NoticeListAdapter(Context ctx, List list) { + super(ctx, list); + } + + @Override + public NoticeListHolder createHolder(ViewGroup parent, int viewType) { + View itemView = LayoutInflater.from(mContext).inflate(R.layout.item_notice, parent, false); + return new NoticeListHolder(itemView); + } + + @Override + public void bindHolder(NoticeListHolder h, int i) { + NoticeListBean.RowsBean b = mData.get(i); + h.mTvTitle.setText(b.getTitle()); + h.mTvSource.setText(b.getSource()); + h.mTvTime.setText(b.getPublishDate()); + if (!TextUtils.isEmpty(b.getCoverPhotos())) { + h.mIvCover.setVisibility(View.VISIBLE); + String[] split = b.getCoverPhotos().split(","); + String s = BaseUrlApi.BASE_IMG_URL + split[0]; + Glide.with(mContext) + .load(s) + .apply(options) + .into(h.mIvCover); + } else { + h.mIvCover.setVisibility(View.GONE); + } + } +} diff --git a/commonmodule/src/main/java/com/tengshisoft/commonmodule/beans/MigrantDetailBean.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/beans/MigrantDetailBean.java index 78ce0fe..893b39d 100644 --- a/commonmodule/src/main/java/com/tengshisoft/commonmodule/beans/MigrantDetailBean.java +++ b/commonmodule/src/main/java/com/tengshisoft/commonmodule/beans/MigrantDetailBean.java @@ -8,19 +8,85 @@ package com.tengshisoft.commonmodule.beans; */ public class MigrantDetailBean { + private String areaCode; + private String areaId; + private String areaNames; + private String birthDate; private String cardExpireDate; private String cardNumber; + private String currentResidence; + private String currentResidenceAddr; + private String currentResidenceDictionaryName; + private String education; + private String educationDictionaryName; private String floatingPopulationId; private String fullName; + private String gender; + private String genderDictionaryName; + private String gridId; + private String gridName; + private String healthyStatus; private String idCardNumber; private String inflowReason; private String inflowReasonDict; private String keyOfFollow; + private String maritalStatus; + private String maritalStatusDictionaryName; + private String nameUsedBefore; + private String nation; + private String nationDictionaryName; + private String nativePlace; + private String nativePlaceAddr; + private String nativePlaceDictionaryName; + private String occupation; + private String occupationCategory; + private String occupationCategoryDictionaryName; + private String politicalStatus; + private String politicalStatusDictionaryName; private String registerDate; + private String registeredResidence; + private String registeredResidenceAddr; + private String registeredResidenceDictionaryName; private String registrationType; private String registrationTypeDict; + private String religion; + private String religionDictionaryName; private String residenceType; private String residenceTypeDict; + private String serviceSpace; + private String telephone; + + public String getAreaCode() { + return areaCode; + } + + public void setAreaCode(String areaCode) { + this.areaCode = areaCode; + } + + public String getAreaId() { + return areaId; + } + + public void setAreaId(String areaId) { + this.areaId = areaId; + } + + public String getAreaNames() { + return areaNames; + } + + public void setAreaNames(String areaNames) { + this.areaNames = areaNames; + } + + public String getBirthDate() { + return birthDate; + } + + public void setBirthDate(String birthDate) { + this.birthDate = birthDate; + } public String getCardExpireDate() { return cardExpireDate; @@ -38,6 +104,46 @@ public class MigrantDetailBean { this.cardNumber = cardNumber; } + public String getCurrentResidence() { + return currentResidence; + } + + public void setCurrentResidence(String currentResidence) { + this.currentResidence = currentResidence; + } + + public String getCurrentResidenceAddr() { + return currentResidenceAddr; + } + + public void setCurrentResidenceAddr(String currentResidenceAddr) { + this.currentResidenceAddr = currentResidenceAddr; + } + + public String getCurrentResidenceDictionaryName() { + return currentResidenceDictionaryName; + } + + public void setCurrentResidenceDictionaryName(String currentResidenceDictionaryName) { + this.currentResidenceDictionaryName = currentResidenceDictionaryName; + } + + public String getEducation() { + return education; + } + + public void setEducation(String education) { + this.education = education; + } + + public String getEducationDictionaryName() { + return educationDictionaryName; + } + + public void setEducationDictionaryName(String educationDictionaryName) { + this.educationDictionaryName = educationDictionaryName; + } + public String getFloatingPopulationId() { return floatingPopulationId; } @@ -54,6 +160,46 @@ public class MigrantDetailBean { this.fullName = fullName; } + public String getGender() { + return gender; + } + + public void setGender(String gender) { + this.gender = gender; + } + + public String getGenderDictionaryName() { + return genderDictionaryName; + } + + public void setGenderDictionaryName(String genderDictionaryName) { + this.genderDictionaryName = genderDictionaryName; + } + + public String getGridId() { + return gridId; + } + + public void setGridId(String gridId) { + this.gridId = gridId; + } + + public String getGridName() { + return gridName; + } + + public void setGridName(String gridName) { + this.gridName = gridName; + } + + public String getHealthyStatus() { + return healthyStatus; + } + + public void setHealthyStatus(String healthyStatus) { + this.healthyStatus = healthyStatus; + } + public String getIdCardNumber() { return idCardNumber; } @@ -86,6 +232,110 @@ public class MigrantDetailBean { this.keyOfFollow = keyOfFollow; } + public String getMaritalStatus() { + return maritalStatus; + } + + public void setMaritalStatus(String maritalStatus) { + this.maritalStatus = maritalStatus; + } + + public String getMaritalStatusDictionaryName() { + return maritalStatusDictionaryName; + } + + public void setMaritalStatusDictionaryName(String maritalStatusDictionaryName) { + this.maritalStatusDictionaryName = maritalStatusDictionaryName; + } + + public String getNameUsedBefore() { + return nameUsedBefore; + } + + public void setNameUsedBefore(String nameUsedBefore) { + this.nameUsedBefore = nameUsedBefore; + } + + public String getNation() { + return nation; + } + + public void setNation(String nation) { + this.nation = nation; + } + + public String getNationDictionaryName() { + return nationDictionaryName; + } + + public void setNationDictionaryName(String nationDictionaryName) { + this.nationDictionaryName = nationDictionaryName; + } + + public String getNativePlace() { + return nativePlace; + } + + public void setNativePlace(String nativePlace) { + this.nativePlace = nativePlace; + } + + public String getNativePlaceAddr() { + return nativePlaceAddr; + } + + public void setNativePlaceAddr(String nativePlaceAddr) { + this.nativePlaceAddr = nativePlaceAddr; + } + + public String getNativePlaceDictionaryName() { + return nativePlaceDictionaryName; + } + + public void setNativePlaceDictionaryName(String nativePlaceDictionaryName) { + this.nativePlaceDictionaryName = nativePlaceDictionaryName; + } + + public String getOccupation() { + return occupation; + } + + public void setOccupation(String occupation) { + this.occupation = occupation; + } + + public String getOccupationCategory() { + return occupationCategory; + } + + public void setOccupationCategory(String occupationCategory) { + this.occupationCategory = occupationCategory; + } + + public String getOccupationCategoryDictionaryName() { + return occupationCategoryDictionaryName; + } + + public void setOccupationCategoryDictionaryName(String occupationCategoryDictionaryName) { + this.occupationCategoryDictionaryName = occupationCategoryDictionaryName; + } + + public String getPoliticalStatus() { + return politicalStatus; + } + + public void setPoliticalStatus(String politicalStatus) { + this.politicalStatus = politicalStatus; + } + + public String getPoliticalStatusDictionaryName() { + return politicalStatusDictionaryName; + } + + public void setPoliticalStatusDictionaryName(String politicalStatusDictionaryName) { + this.politicalStatusDictionaryName = politicalStatusDictionaryName; + } + public String getRegisterDate() { return registerDate; } @@ -94,6 +344,30 @@ public class MigrantDetailBean { this.registerDate = registerDate; } + public String getRegisteredResidence() { + return registeredResidence; + } + + public void setRegisteredResidence(String registeredResidence) { + this.registeredResidence = registeredResidence; + } + + public String getRegisteredResidenceAddr() { + return registeredResidenceAddr; + } + + public void setRegisteredResidenceAddr(String registeredResidenceAddr) { + this.registeredResidenceAddr = registeredResidenceAddr; + } + + public String getRegisteredResidenceDictionaryName() { + return registeredResidenceDictionaryName; + } + + public void setRegisteredResidenceDictionaryName(String registeredResidenceDictionaryName) { + this.registeredResidenceDictionaryName = registeredResidenceDictionaryName; + } + public String getRegistrationType() { return registrationType; } @@ -110,6 +384,22 @@ public class MigrantDetailBean { this.registrationTypeDict = registrationTypeDict; } + public String getReligion() { + return religion; + } + + public void setReligion(String religion) { + this.religion = religion; + } + + public String getReligionDictionaryName() { + return religionDictionaryName; + } + + public void setReligionDictionaryName(String religionDictionaryName) { + this.religionDictionaryName = religionDictionaryName; + } + public String getResidenceType() { return residenceType; } @@ -125,4 +415,20 @@ public class MigrantDetailBean { public void setResidenceTypeDict(String residenceTypeDict) { this.residenceTypeDict = residenceTypeDict; } + + public String getServiceSpace() { + return serviceSpace; + } + + public void setServiceSpace(String serviceSpace) { + this.serviceSpace = serviceSpace; + } + + public String getTelephone() { + return telephone; + } + + public void setTelephone(String telephone) { + this.telephone = telephone; + } } diff --git a/commonmodule/src/main/java/com/tengshisoft/commonmodule/beans/NoticeDetailBean.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/beans/NoticeDetailBean.java new file mode 100644 index 0000000..685a970 --- /dev/null +++ b/commonmodule/src/main/java/com/tengshisoft/commonmodule/beans/NoticeDetailBean.java @@ -0,0 +1,149 @@ +package com.tengshisoft.commonmodule.beans; + +public class NoticeDetailBean { + + private String author; + private String categoryId; + private String categorySummary; + private String categoryTitle; + private String content; + private String contentId; + private String coverPhotos; + private String gmtCreate; + private int isPublish; + private String link; + private String publishDate; + private String sort; + private String source; + private String subTitle; + private String summary; + private String title; + + public String getAuthor() { + return author; + } + + public void setAuthor(String author) { + this.author = author; + } + + public String getCategoryId() { + return categoryId; + } + + public void setCategoryId(String categoryId) { + this.categoryId = categoryId; + } + + public String getCategorySummary() { + return categorySummary; + } + + public void setCategorySummary(String categorySummary) { + this.categorySummary = categorySummary; + } + + public String getCategoryTitle() { + return categoryTitle; + } + + public void setCategoryTitle(String categoryTitle) { + this.categoryTitle = categoryTitle; + } + + public String getContent() { + return content; + } + + public void setContent(String content) { + this.content = content; + } + + public String getContentId() { + return contentId; + } + + public void setContentId(String contentId) { + this.contentId = contentId; + } + + public String getCoverPhotos() { + return coverPhotos; + } + + public void setCoverPhotos(String coverPhotos) { + this.coverPhotos = coverPhotos; + } + + public String getGmtCreate() { + return gmtCreate; + } + + public void setGmtCreate(String gmtCreate) { + this.gmtCreate = gmtCreate; + } + + public int getIsPublish() { + return isPublish; + } + + public void setIsPublish(int isPublish) { + this.isPublish = isPublish; + } + + public String getLink() { + return link; + } + + public void setLink(String link) { + this.link = link; + } + + public String getPublishDate() { + return publishDate; + } + + public void setPublishDate(String publishDate) { + this.publishDate = publishDate; + } + + public String getSort() { + return sort; + } + + public void setSort(String sort) { + this.sort = sort; + } + + public String getSource() { + return source; + } + + public void setSource(String source) { + this.source = source; + } + + public String getSubTitle() { + return subTitle; + } + + public void setSubTitle(String subTitle) { + this.subTitle = subTitle; + } + + public String getSummary() { + return summary; + } + + public void setSummary(String summary) { + this.summary = summary; + } + + public String getTitle() { + return title; + } + + public void setTitle(String title) { + this.title = title; + } +} diff --git a/commonmodule/src/main/java/com/tengshisoft/commonmodule/beans/NoticeListBean.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/beans/NoticeListBean.java new file mode 100644 index 0000000..fbfd460 --- /dev/null +++ b/commonmodule/src/main/java/com/tengshisoft/commonmodule/beans/NoticeListBean.java @@ -0,0 +1,181 @@ +package com.tengshisoft.commonmodule.beans; + +import java.util.List; + +public class NoticeListBean { + + private int page; + private List rows; + private int total; + + public int getPage() { + return page; + } + + public void setPage(int page) { + this.page = page; + } + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsBean { + private String author; + private String categoryId; + private String categorySummary; + private String categoryTitle; + private String content; + private String contentId; + private String coverPhotos; + private String gmtCreate; + private int isPublish; + private String link; + private String publishDate; + private String sort; + private String source; + private String subTitle; + private String summary; + private String title; + + public String getAuthor() { + return author; + } + + public void setAuthor(String author) { + this.author = author; + } + + public String getCategoryId() { + return categoryId; + } + + public void setCategoryId(String categoryId) { + this.categoryId = categoryId; + } + + public String getCategorySummary() { + return categorySummary; + } + + public void setCategorySummary(String categorySummary) { + this.categorySummary = categorySummary; + } + + public String getCategoryTitle() { + return categoryTitle; + } + + public void setCategoryTitle(String categoryTitle) { + this.categoryTitle = categoryTitle; + } + + public String getContent() { + return content; + } + + public void setContent(String content) { + this.content = content; + } + + public String getContentId() { + return contentId; + } + + public void setContentId(String contentId) { + this.contentId = contentId; + } + + public String getCoverPhotos() { + return coverPhotos; + } + + public void setCoverPhotos(String coverPhotos) { + this.coverPhotos = coverPhotos; + } + + public String getGmtCreate() { + return gmtCreate; + } + + public void setGmtCreate(String gmtCreate) { + this.gmtCreate = gmtCreate; + } + + public int getIsPublish() { + return isPublish; + } + + public void setIsPublish(int isPublish) { + this.isPublish = isPublish; + } + + public String getLink() { + return link; + } + + public void setLink(String link) { + this.link = link; + } + + public String getPublishDate() { + return publishDate; + } + + public void setPublishDate(String publishDate) { + this.publishDate = publishDate; + } + + public String getSort() { + return sort; + } + + public void setSort(String sort) { + this.sort = sort; + } + + public String getSource() { + return source; + } + + public void setSource(String source) { + this.source = source; + } + + public String getSubTitle() { + return subTitle; + } + + public void setSubTitle(String subTitle) { + this.subTitle = subTitle; + } + + public String getSummary() { + return summary; + } + + public void setSummary(String summary) { + this.summary = summary; + } + + public String getTitle() { + return title; + } + + public void setTitle(String title) { + this.title = title; + } + } +} diff --git a/commonmodule/src/main/java/com/tengshisoft/commonmodule/beans/SaveFloatingBean.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/beans/SaveFloatingBean.java index e256fad..69db9c0 100644 --- a/commonmodule/src/main/java/com/tengshisoft/commonmodule/beans/SaveFloatingBean.java +++ b/commonmodule/src/main/java/com/tengshisoft/commonmodule/beans/SaveFloatingBean.java @@ -24,6 +24,184 @@ public class SaveFloatingBean { private String gridId;// 网格ID private String gridName;// 网格名称 + + private String birthDate; + private String currentResidence; + private String currentResidenceAddr; + private String education; + private String gender; + private String maritalStatus; + private String nameUsedBefore; + private String nation; + private String nativePlace; + private String nativePlaceAddr; + private String occupation; + private String occupationCategory; + private String politicalStatus; + private String registeredResidence; + private String registeredResidenceAddr; + private String religion; + private String serviceSpace; + private String telephone; + private String type; + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + + public String getNativePlaceAddr() { + return nativePlaceAddr; + } + + public void setNativePlaceAddr(String nativePlaceAddr) { + this.nativePlaceAddr = nativePlaceAddr; + } + + + public String getBirthDate() { + return birthDate; + } + + public void setBirthDate(String birthDate) { + this.birthDate = birthDate; + } + + public String getCurrentResidence() { + return currentResidence; + } + + public void setCurrentResidence(String currentResidence) { + this.currentResidence = currentResidence; + } + + public String getCurrentResidenceAddr() { + return currentResidenceAddr; + } + + public void setCurrentResidenceAddr(String currentResidenceAddr) { + this.currentResidenceAddr = currentResidenceAddr; + } + + public String getEducation() { + return education; + } + + public void setEducation(String education) { + this.education = education; + } + + + + public String getGender() { + return gender; + } + + public void setGender(String gender) { + this.gender = gender; + } + + + + public String getMaritalStatus() { + return maritalStatus; + } + + public void setMaritalStatus(String maritalStatus) { + this.maritalStatus = maritalStatus; + } + + public String getNameUsedBefore() { + return nameUsedBefore; + } + + public void setNameUsedBefore(String nameUsedBefore) { + this.nameUsedBefore = nameUsedBefore; + } + + public String getNation() { + return nation; + } + + public void setNation(String nation) { + this.nation = nation; + } + + public String getNativePlace() { + return nativePlace; + } + + public void setNativePlace(String nativePlace) { + this.nativePlace = nativePlace; + } + + public String getOccupation() { + return occupation; + } + + public void setOccupation(String occupation) { + this.occupation = occupation; + } + + public String getOccupationCategory() { + return occupationCategory; + } + + public void setOccupationCategory(String occupationCategory) { + this.occupationCategory = occupationCategory; + } + + public String getPoliticalStatus() { + return politicalStatus; + } + + public void setPoliticalStatus(String politicalStatus) { + this.politicalStatus = politicalStatus; + } + + public String getRegisteredResidence() { + return registeredResidence; + } + + public void setRegisteredResidence(String registeredResidence) { + this.registeredResidence = registeredResidence; + } + + public String getRegisteredResidenceAddr() { + return registeredResidenceAddr; + } + + public void setRegisteredResidenceAddr(String registeredResidenceAddr) { + this.registeredResidenceAddr = registeredResidenceAddr; + } + + public String getReligion() { + return religion; + } + + public void setReligion(String religion) { + this.religion = religion; + } + + public String getServiceSpace() { + return serviceSpace; + } + + public void setServiceSpace(String serviceSpace) { + this.serviceSpace = serviceSpace; + } + + public String getTelephone() { + return telephone; + } + + public void setTelephone(String telephone) { + this.telephone = telephone; + } + public String getAreaNames() { return areaNames; } diff --git a/commonmodule/src/main/java/com/tengshisoft/commonmodule/fragments/IncidentGridStatisticsFragment.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/fragments/IncidentGridStatisticsFragment.java index 12d1b9a..4313d48 100644 --- a/commonmodule/src/main/java/com/tengshisoft/commonmodule/fragments/IncidentGridStatisticsFragment.java +++ b/commonmodule/src/main/java/com/tengshisoft/commonmodule/fragments/IncidentGridStatisticsFragment.java @@ -174,8 +174,10 @@ public class IncidentGridStatisticsFragment extends BaseFragment { setStateView(STATE_SUCCESS); mSrlView.setEnableLoadMore(false); mTvEndDate.setText("截止时间:" + b.getData().getCountDate()); - mTvMineUp.setText(b.getData().getNowUserVillageRank().getReportNum() + "件"); - mTvMineRanking.setText("第" + StringUtils.int2chineseNum(b.getData().getNowUserVillageRank().getPm()) + "名"); + if (b.getData().getNowUserVillageRank() != null) { + mTvMineUp.setText(b.getData().getNowUserVillageRank().getReportNum() + "件"); + mTvMineRanking.setText("第" + StringUtils.int2chineseNum(b.getData().getNowUserVillageRank().getPm()) + "名"); + } mTvCity.setText(b.getData().getCityRank() + ""); mTvCounty.setText(b.getData().getCountyRank() + ""); mTvVillage.setText(b.getData().getCountyStreetRank() + ""); diff --git a/commonmodule/src/main/java/com/tengshisoft/commonmodule/fragments/KnowLedgeDeptListFragment.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/fragments/KnowLedgeDeptListFragment.java index 77063bb..793f936 100644 --- a/commonmodule/src/main/java/com/tengshisoft/commonmodule/fragments/KnowLedgeDeptListFragment.java +++ b/commonmodule/src/main/java/com/tengshisoft/commonmodule/fragments/KnowLedgeDeptListFragment.java @@ -11,7 +11,7 @@ import android.widget.ProgressBar; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; import com.google.gson.Gson; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.scwang.smart.refresh.layout.SmartRefreshLayout; import com.tengshisoft.commonmodule.R; import com.tengshisoft.commonmodule.R2; diff --git a/commonmodule/src/main/java/com/tengshisoft/commonmodule/fragments/KnowLedgeListByDeptFragment.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/fragments/KnowLedgeListByDeptFragment.java index da15a19..c01b781 100644 --- a/commonmodule/src/main/java/com/tengshisoft/commonmodule/fragments/KnowLedgeListByDeptFragment.java +++ b/commonmodule/src/main/java/com/tengshisoft/commonmodule/fragments/KnowLedgeListByDeptFragment.java @@ -9,7 +9,7 @@ import android.widget.ProgressBar; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.scwang.smart.refresh.layout.SmartRefreshLayout; import com.tengshisoft.commonmodule.R; import com.tengshisoft.commonmodule.R2; diff --git a/commonmodule/src/main/java/com/tengshisoft/commonmodule/fragments/KnowLedgeListFragment.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/fragments/KnowLedgeListFragment.java index ed11606..443942c 100644 --- a/commonmodule/src/main/java/com/tengshisoft/commonmodule/fragments/KnowLedgeListFragment.java +++ b/commonmodule/src/main/java/com/tengshisoft/commonmodule/fragments/KnowLedgeListFragment.java @@ -6,7 +6,7 @@ import android.view.View; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.R; import com.tengshisoft.commonmodule.R2; import com.tengshisoft.commonmodule.adapters.KnowLedgeListAdapter; diff --git a/commonmodule/src/main/java/com/tengshisoft/commonmodule/fragments/PopulaceGridStatisticsFragment.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/fragments/PopulaceGridStatisticsFragment.java index 7b7054e..c99cde1 100644 --- a/commonmodule/src/main/java/com/tengshisoft/commonmodule/fragments/PopulaceGridStatisticsFragment.java +++ b/commonmodule/src/main/java/com/tengshisoft/commonmodule/fragments/PopulaceGridStatisticsFragment.java @@ -139,10 +139,11 @@ public class PopulaceGridStatisticsFragment extends BaseFragment { */ private void setYoungData(String per) { Double aDouble = Double.valueOf(per); - Double surplus = 100 - aDouble; - + Double youngPer = aDouble / 100; + Double surplus = 100 - youngPer; + LogUtils.e("占比:" + youngPer + "\n剩余:" + surplus); ArrayList values = new ArrayList<>(); - values.add(new PieEntry(aDouble.floatValue(), "")); + values.add(new PieEntry(youngPer.floatValue(), "")); values.add(new PieEntry(surplus.floatValue(), "")); PieDataSet dataSet = new PieDataSet(values, ""); @@ -154,7 +155,7 @@ public class PopulaceGridStatisticsFragment extends BaseFragment { data.setDrawValues(false); data.setValueTextSize(11f); data.setValueTextColor(Color.WHITE); - mPcYoung.setCenterText(youngCenterSpannableText(aDouble + "")); + mPcYoung.setCenterText(youngCenterSpannableText(youngPer + "")); mPcYoung.setData(data); mPcYoung.invalidate(); //将图表移动到底部 @@ -399,7 +400,7 @@ public class PopulaceGridStatisticsFragment extends BaseFragment { private void setInfoToView(GridPopulaceStatisticsBean b) { mSrlView.setEnableLoadMore(false); mSrlView.setEnableRefresh(true); - mTvEndTime.setText("截止时间:" + TimeUtils.getCurrentDate()); + mTvEndTime.setText("截止时间:" + TimeUtils.getCurrentChineseDate()); mTvBaseRegister.setText(b.getHuJi() + "");//户籍人口 mTvRegisterOut.setText(b.getWaiChuHuJi() + "");//户籍人口外出 mTvNoRegister.setText(b.getFeiHuJi() + "");//非户籍人口 diff --git a/commonmodule/src/main/java/com/tengshisoft/commonmodule/holders/NoticeListHolder.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/holders/NoticeListHolder.java new file mode 100644 index 0000000..366daee --- /dev/null +++ b/commonmodule/src/main/java/com/tengshisoft/commonmodule/holders/NoticeListHolder.java @@ -0,0 +1,34 @@ +package com.tengshisoft.commonmodule.holders; + +import android.view.View; +import android.widget.ImageView; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; + +import com.tengshisoft.commonmodule.R; + +import org.jetbrains.annotations.NotNull; + +/** + * 作者: adam + * 日期: 2021/9/26 - 3:01 下午 + * 邮箱: itgaojian@163.com + * 描述: 通知公告 + */ +public class NoticeListHolder extends RecyclerView.ViewHolder { + + public ImageView mIvCover; + public TextView mTvTitle; + public TextView mTvSource; + public TextView mTvTime; + + public NoticeListHolder(@NonNull @NotNull View itemView) { + super(itemView); + mIvCover = itemView.findViewById(R.id.iv_cover); + mTvTitle = itemView.findViewById(R.id.tv_title); + mTvSource = itemView.findViewById(R.id.tv_source); + mTvTime = itemView.findViewById(R.id.tv_time); + } +} diff --git a/commonmodule/src/main/java/com/tengshisoft/commonmodule/nets/GridApis.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/nets/GridApis.java index d7650ff..7a48ab5 100644 --- a/commonmodule/src/main/java/com/tengshisoft/commonmodule/nets/GridApis.java +++ b/commonmodule/src/main/java/com/tengshisoft/commonmodule/nets/GridApis.java @@ -295,6 +295,25 @@ public interface GridApis { @POST("app/residentialintroduction/save") Observable doSaveCommunityDesc(@Body RequestBody body, @Header("token") String token); + + /** + * 通知公告列表 + */ + @Headers({"Content-Type: application/json", "Accept: application/json"}) + @GET("app/contentrelease/listpage") + Observable getArticleList(@Query("keywords") String keywords, + @Query("categoryId") String id, + @Query("page") String page, + @Header("token") String token); + + /** + * 通知公告类型 + */ + @Headers({"Content-Type: application/json", "Accept: application/json"}) + @GET("app/contentrelease/get/{contentId}") + Observable getArticleDetail(@Path("contentId") String id, + @Header("token") String token); + /** * 获取分拨历史信息 */ @@ -1578,6 +1597,7 @@ public interface GridApis { Observable getGridIncidentRanking(@Path("areaCode") String areaCode, @Path("type") String type, @Header("token") String token); + /** * 网格员网格内人口数据统计 * / diff --git a/commonmodule/src/main/res/drawable-xhdpi/ic_incident_statistics_bg.jpg b/commonmodule/src/main/res/drawable-xhdpi/ic_incident_statistics_bg.jpg index 0dd3de5..bf28a26 100644 Binary files a/commonmodule/src/main/res/drawable-xhdpi/ic_incident_statistics_bg.jpg and b/commonmodule/src/main/res/drawable-xhdpi/ic_incident_statistics_bg.jpg differ diff --git a/commonmodule/src/main/res/drawable-xhdpi/ic_statistics_radio_bg.9.png b/commonmodule/src/main/res/drawable-xhdpi/ic_statistics_radio_bg.9.png index c72666b..cf375ff 100644 Binary files a/commonmodule/src/main/res/drawable-xhdpi/ic_statistics_radio_bg.9.png and b/commonmodule/src/main/res/drawable-xhdpi/ic_statistics_radio_bg.9.png differ diff --git a/commonmodule/src/main/res/drawable-xhdpi/ic_statistics_radio_bg_no_sel.png b/commonmodule/src/main/res/drawable-xhdpi/ic_statistics_radio_bg_no_sel.png new file mode 100644 index 0000000..8a355dc Binary files /dev/null and b/commonmodule/src/main/res/drawable-xhdpi/ic_statistics_radio_bg_no_sel.png differ diff --git a/commonmodule/src/main/res/drawable/switch_statistics_img.xml b/commonmodule/src/main/res/drawable/switch_statistics_img.xml index deda281..5e41c1b 100755 --- a/commonmodule/src/main/res/drawable/switch_statistics_img.xml +++ b/commonmodule/src/main/res/drawable/switch_statistics_img.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/commonmodule/src/main/res/layout/activity_grid_incident_statistics_viewpage.xml b/commonmodule/src/main/res/layout/activity_grid_incident_statistics_viewpage.xml index 51a024d..79deab9 100644 --- a/commonmodule/src/main/res/layout/activity_grid_incident_statistics_viewpage.xml +++ b/commonmodule/src/main/res/layout/activity_grid_incident_statistics_viewpage.xml @@ -22,7 +22,7 @@ android:layout_centerVertical="true" android:src="@drawable/ic_arrow_left_white_48" /> - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/commonmodule/src/main/res/layout/activity_notice_list.xml b/commonmodule/src/main/res/layout/activity_notice_list.xml new file mode 100644 index 0000000..42f0940 --- /dev/null +++ b/commonmodule/src/main/res/layout/activity_notice_list.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/commonmodule/src/main/res/layout/fragment_grid_incident_statistics.xml b/commonmodule/src/main/res/layout/fragment_grid_incident_statistics.xml index 521d87c..84dd185 100644 --- a/commonmodule/src/main/res/layout/fragment_grid_incident_statistics.xml +++ b/commonmodule/src/main/res/layout/fragment_grid_incident_statistics.xml @@ -57,7 +57,7 @@ android:gravity="center_vertical" android:orientation="horizontal"> - - - - @@ -284,7 +286,7 @@ android:layout_height="match_parent" android:background="@color/text_blue_52" /> - - + android:layout_gravity="center" + android:minHeight="200dp" /> - - - - - - - - - - - - + + + + + + + + + + + + + @@ -251,7 +252,8 @@ android:gravity="center" android:minHeight="78dp" android:orientation="vertical" - android:padding="10dp"> + android:padding="10dp" + android:visibility="gone"> - - diff --git a/commonmodule/src/main/res/layout/item_notice.xml b/commonmodule/src/main/res/layout/item_notice.xml new file mode 100644 index 0000000..ec2ee4f --- /dev/null +++ b/commonmodule/src/main/res/layout/item_notice.xml @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/BindPersonToHouseActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/BindPersonToHouseActivity.java index e34f499..f6ecfaa 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/BindPersonToHouseActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/BindPersonToHouseActivity.java @@ -17,7 +17,7 @@ import com.alibaba.android.arouter.launcher.ARouter; import com.bigkoo.pickerview.builder.OptionsPickerBuilder; import com.bigkoo.pickerview.view.OptionsPickerView; import com.google.gson.Gson; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.scwang.smart.refresh.layout.SmartRefreshLayout; import com.tengshisoft.commonmodule.adapters.HireRecordAdapter; import com.tengshisoft.commonmodule.beans.BindPersonBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/BuildingAddActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/BuildingAddActivity.java index 14de0b2..5e2c9f6 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/BuildingAddActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/BuildingAddActivity.java @@ -36,7 +36,7 @@ import com.baidu.mapapi.model.LatLng; import com.bigkoo.pickerview.builder.OptionsPickerBuilder; import com.bigkoo.pickerview.view.OptionsPickerView; import com.google.gson.Gson; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.beans.BuildSubmitBean; import com.tengshisoft.commonmodule.beans.BuildingSaveBean; import com.tengshisoft.commonmodule.beans.SuccessBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/BuildingDetailActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/BuildingDetailActivity.java index a7285ab..5d3159a 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/BuildingDetailActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/BuildingDetailActivity.java @@ -35,7 +35,7 @@ import com.baidu.mapapi.model.LatLng; import com.ctetin.expandabletextviewlibrary.ExpandableTextView; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.scwang.smart.refresh.layout.SmartRefreshLayout; import com.tengshisoft.commonmodule.adapters.BuildingManagerAdapter; import com.tengshisoft.commonmodule.beans.BuildingDetailBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/BuildingEditActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/BuildingEditActivity.java index be20cdf..312290a 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/BuildingEditActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/BuildingEditActivity.java @@ -38,7 +38,7 @@ import com.bigkoo.pickerview.builder.OptionsPickerBuilder; import com.bigkoo.pickerview.view.OptionsPickerView; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.beans.BuildSubmitBean; import com.tengshisoft.commonmodule.beans.BuildingDetailBean; import com.tengshisoft.commonmodule.beans.BuildingSaveBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/BuildingListActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/BuildingListActivity.java index 1bece69..626f5f2 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/BuildingListActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/BuildingListActivity.java @@ -24,7 +24,7 @@ import android.widget.TextView; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.scwang.smart.refresh.layout.SmartRefreshLayout; import com.tengshisoft.commonmodule.adapters.BuildingListAdapter; import com.tengshisoft.commonmodule.beans.BuildingListBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/BuildingManagerAddActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/BuildingManagerAddActivity.java index a4074a4..cad4a33 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/BuildingManagerAddActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/BuildingManagerAddActivity.java @@ -13,7 +13,7 @@ import com.bigkoo.pickerview.builder.TimePickerBuilder; import com.bigkoo.pickerview.view.OptionsPickerView; import com.bigkoo.pickerview.view.TimePickerView; import com.google.gson.Gson; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.beans.SaveBuildingManagerBean; import com.tengshisoft.commonmodule.beans.SuccessBean; import com.tengshisoft.commonmodule.nets.GridApis; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/BuildingManagerDetailActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/BuildingManagerDetailActivity.java index e2b3bde..b85e35d 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/BuildingManagerDetailActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/BuildingManagerDetailActivity.java @@ -9,7 +9,7 @@ import android.widget.TextView; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.beans.BuildingManagerDetailBean; import com.tengshisoft.commonmodule.beans.SuccessBean; import com.tengshisoft.commonmodule.nets.GridApis; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/BuildingManagerEditActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/BuildingManagerEditActivity.java index 954eaee..0dedccd 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/BuildingManagerEditActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/BuildingManagerEditActivity.java @@ -13,7 +13,7 @@ import com.bigkoo.pickerview.builder.TimePickerBuilder; import com.bigkoo.pickerview.view.OptionsPickerView; import com.bigkoo.pickerview.view.TimePickerView; import com.google.gson.Gson; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.beans.BuildingManagerDetailBean; import com.tengshisoft.commonmodule.beans.SaveBuildingManagerBean; import com.tengshisoft.commonmodule.beans.SuccessBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/CommunityAddActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/CommunityAddActivity.java index 4c0685f..9487dc3 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/CommunityAddActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/CommunityAddActivity.java @@ -27,7 +27,7 @@ import com.baidu.mapapi.model.LatLng; import com.bigkoo.pickerview.builder.OptionsPickerBuilder; import com.bigkoo.pickerview.view.OptionsPickerView; import com.google.gson.Gson; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.beans.AreaGridListBean; import com.tengshisoft.commonmodule.beans.CommunitySaveBean; import com.tengshisoft.commonmodule.beans.SuccessBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/CommunityAreaAddActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/CommunityAreaAddActivity.java index 52ae51e..f3d42e2 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/CommunityAreaAddActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/CommunityAreaAddActivity.java @@ -24,7 +24,7 @@ import com.baidu.mapapi.map.MarkerOptions; import com.baidu.mapapi.map.TextureMapView; import com.baidu.mapapi.model.LatLng; import com.google.gson.Gson; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.beans.AreaGridListBean; import com.tengshisoft.commonmodule.beans.SaveCommunityAreaBean; import com.tengshisoft.commonmodule.beans.SuccessBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/CommunityAreaDescAddActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/CommunityAreaDescAddActivity.java index eb01e74..a52c50d 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/CommunityAreaDescAddActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/CommunityAreaDescAddActivity.java @@ -17,7 +17,7 @@ import android.widget.LinearLayout; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; import com.google.gson.Gson; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.beans.SaveCommunityAreaDescBean; import com.tengshisoft.commonmodule.beans.SuccessBean; import com.tengshisoft.commonmodule.nets.GridApis; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/CommunityAreaDescEditActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/CommunityAreaDescEditActivity.java index 16e3598..6f1907e 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/CommunityAreaDescEditActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/CommunityAreaDescEditActivity.java @@ -18,7 +18,7 @@ import android.widget.LinearLayout; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; import com.google.gson.Gson; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.beans.CommunityAreaDescDetailBean; import com.tengshisoft.commonmodule.beans.SaveCommunityAreaDescBean; import com.tengshisoft.commonmodule.beans.SuccessBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/CommunityAreaDetailActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/CommunityAreaDetailActivity.java index e386c52..f8e51eb 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/CommunityAreaDetailActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/CommunityAreaDetailActivity.java @@ -25,7 +25,7 @@ import com.baidu.mapapi.map.MarkerOptions; import com.baidu.mapapi.map.TextureMapView; import com.baidu.mapapi.model.LatLng; import com.ctetin.expandabletextviewlibrary.ExpandableTextView; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.scwang.smart.refresh.layout.SmartRefreshLayout; import com.tengshisoft.commonmodule.adapters.CommunityAreaDescAdapter; import com.tengshisoft.commonmodule.beans.CommunityAreaDescListBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/CommunityAreaEditActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/CommunityAreaEditActivity.java index 76601eb..40b4b18 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/CommunityAreaEditActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/CommunityAreaEditActivity.java @@ -25,7 +25,7 @@ import com.baidu.mapapi.map.MarkerOptions; import com.baidu.mapapi.map.TextureMapView; import com.baidu.mapapi.model.LatLng; import com.google.gson.Gson; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.beans.AreaGridListBean; import com.tengshisoft.commonmodule.beans.CommunityAreaDetailBean; import com.tengshisoft.commonmodule.beans.SaveCommunityAreaBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/CommunityAreaListActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/CommunityAreaListActivity.java index 076d471..9322d02 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/CommunityAreaListActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/CommunityAreaListActivity.java @@ -14,7 +14,7 @@ import android.widget.TextView; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.scwang.smart.refresh.layout.SmartRefreshLayout; import com.tengshisoft.commonmodule.adapters.CommunityAreaListAdapter; import com.tengshisoft.commonmodule.beans.CommunityAreaListBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/CommunityDescAddActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/CommunityDescAddActivity.java index c83a461..c083cf3 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/CommunityDescAddActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/CommunityDescAddActivity.java @@ -17,7 +17,7 @@ import android.widget.LinearLayout; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; import com.google.gson.Gson; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.beans.SaveCommunityDescBean; import com.tengshisoft.commonmodule.beans.SuccessBean; import com.tengshisoft.commonmodule.nets.GridApis; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/CommunityDescEditActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/CommunityDescEditActivity.java index e9f6b50..91c62be 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/CommunityDescEditActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/CommunityDescEditActivity.java @@ -18,7 +18,7 @@ import android.widget.LinearLayout; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; import com.google.gson.Gson; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.beans.CommunityDescDetailBean; import com.tengshisoft.commonmodule.beans.SaveCommunityAreaDescBean; import com.tengshisoft.commonmodule.beans.SuccessBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/CommunityDetailActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/CommunityDetailActivity.java index 579bb37..2bd2ba4 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/CommunityDetailActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/CommunityDetailActivity.java @@ -26,7 +26,7 @@ import com.baidu.mapapi.map.MarkerOptions; import com.baidu.mapapi.map.TextureMapView; import com.baidu.mapapi.model.LatLng; import com.ctetin.expandabletextviewlibrary.ExpandableTextView; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.scwang.smart.refresh.layout.SmartRefreshLayout; import com.tengshisoft.commonmodule.adapters.CommunityDescAdapter; import com.tengshisoft.commonmodule.beans.CommunityDescListBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/CommunityEditActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/CommunityEditActivity.java index bfcc037..a7b9cc3 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/CommunityEditActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/CommunityEditActivity.java @@ -27,7 +27,7 @@ import com.baidu.mapapi.model.LatLng; import com.bigkoo.pickerview.builder.OptionsPickerBuilder; import com.bigkoo.pickerview.view.OptionsPickerView; import com.google.gson.Gson; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.beans.AreaGridListBean; import com.tengshisoft.commonmodule.beans.CommunityDetailBean; import com.tengshisoft.commonmodule.beans.CommunitySaveBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/CommunityManageActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/CommunityManageActivity.java index ebb235e..8658f23 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/CommunityManageActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/CommunityManageActivity.java @@ -10,7 +10,7 @@ import android.widget.TextView; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.scwang.smart.refresh.layout.SmartRefreshLayout; import com.tengshisoft.commonmodule.adapters.CommunityListAdapter; import com.tengshisoft.commonmodule.beans.CommunityListBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/FamilyMemberAddActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/FamilyMemberAddActivity.java index e5ba2c5..3a618c7 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/FamilyMemberAddActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/FamilyMemberAddActivity.java @@ -18,7 +18,7 @@ import com.alibaba.android.arouter.launcher.ARouter; import com.bigkoo.pickerview.builder.OptionsPickerBuilder; import com.bigkoo.pickerview.view.OptionsPickerView; import com.google.gson.Gson; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.scwang.smart.refresh.layout.SmartRefreshLayout; import com.tengshisoft.commonmodule.adapters.HireRecordMemberAdapter; import com.tengshisoft.commonmodule.beans.FamilyMemberListBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/FamilyMemberDetailActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/FamilyMemberDetailActivity.java index f6f79ae..c76783d 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/FamilyMemberDetailActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/FamilyMemberDetailActivity.java @@ -11,7 +11,7 @@ import android.widget.TextView; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; import com.ctetin.expandabletextviewlibrary.ExpandableTextView; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.beans.FamilyMemberDetailBean; import com.tengshisoft.commonmodule.beans.SuccessBean; import com.tengshisoft.commonmodule.nets.GridApis; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/FamilyMemberEditActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/FamilyMemberEditActivity.java index 07307a6..c48488d 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/FamilyMemberEditActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/FamilyMemberEditActivity.java @@ -12,7 +12,7 @@ import com.alibaba.android.arouter.facade.annotation.Route; import com.bigkoo.pickerview.builder.OptionsPickerBuilder; import com.bigkoo.pickerview.view.OptionsPickerView; import com.google.gson.Gson; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.beans.FamilyMemberDetailBean; import com.tengshisoft.commonmodule.beans.SaveFamilyMemberBean; import com.tengshisoft.commonmodule.beans.SuccessBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/HirerDetailActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/HirerDetailActivity.java index 549ce74..610dbbb 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/HirerDetailActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/HirerDetailActivity.java @@ -14,7 +14,7 @@ import android.widget.TextView; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; import com.ctetin.expandabletextviewlibrary.ExpandableTextView; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.scwang.smart.refresh.layout.SmartRefreshLayout; import com.tengshisoft.commonmodule.adapters.HireRecordMemberAdapter; import com.tengshisoft.commonmodule.beans.FamilyMemberListBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/HirerEditActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/HirerEditActivity.java index 6d0e327..2276573 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/HirerEditActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/HirerEditActivity.java @@ -11,7 +11,7 @@ import com.alibaba.android.arouter.facade.annotation.Route; import com.bigkoo.pickerview.builder.OptionsPickerBuilder; import com.bigkoo.pickerview.view.OptionsPickerView; import com.google.gson.Gson; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.beans.BindPersonBean; import com.tengshisoft.commonmodule.beans.HireRecordDetailBean; import com.tengshisoft.commonmodule.beans.SuccessBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/HouseDetailActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/HouseDetailActivity.java index cd106d8..724d635 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/HouseDetailActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/HouseDetailActivity.java @@ -15,7 +15,7 @@ import android.widget.TextView; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; import com.ctetin.expandabletextviewlibrary.ExpandableTextView; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.scwang.smart.refresh.layout.SmartRefreshLayout; import com.tengshisoft.commonmodule.adapters.HireRecordAdapter; import com.tengshisoft.commonmodule.beans.HireRecordListBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/HouseEditActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/HouseEditActivity.java index 3ce13ee..8126074 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/HouseEditActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/HouseEditActivity.java @@ -12,7 +12,7 @@ import com.alibaba.android.arouter.facade.annotation.Route; import com.bigkoo.pickerview.builder.OptionsPickerBuilder; import com.bigkoo.pickerview.view.OptionsPickerView; import com.google.gson.Gson; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.beans.HouseDetailBean; import com.tengshisoft.commonmodule.beans.HouseSaveBean; import com.tengshisoft.commonmodule.beans.SuccessBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/HouseListActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/HouseListActivity.java index 108a591..e86c908 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/HouseListActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/HouseListActivity.java @@ -12,7 +12,7 @@ import android.widget.TextView; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.scwang.smart.refresh.layout.SmartRefreshLayout; import com.tengshisoft.commonmodule.adapters.HouseListAdapter; import com.tengshisoft.commonmodule.beans.HouseListBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/SearchHouseByPersonActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/SearchHouseByPersonActivity.java index 3098c44..779d731 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/SearchHouseByPersonActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/SearchHouseByPersonActivity.java @@ -12,7 +12,7 @@ import android.widget.TextView; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.scwang.smart.refresh.layout.SmartRefreshLayout; import com.tengshisoft.commonmodule.adapters.HouseListAdapter; import com.tengshisoft.commonmodule.beans.HouseListBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/fragment/BuildingAreaManageFragment.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/fragment/BuildingAreaManageFragment.java index 4658b13..a56a2ea 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/fragment/BuildingAreaManageFragment.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/fragment/BuildingAreaManageFragment.java @@ -10,7 +10,7 @@ import androidx.recyclerview.widget.RecyclerView; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.adapters.CommunityListAdapter; import com.tengshisoft.commonmodule.beans.CommunityListBean; import com.tengshisoft.commonmodule.nets.GridApis; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/fragment/BuildingListFragment.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/fragment/BuildingListFragment.java index 5bfe205..bbcdb99 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/fragment/BuildingListFragment.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/fragment/BuildingListFragment.java @@ -11,7 +11,7 @@ import androidx.recyclerview.widget.RecyclerView; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.adapters.BuildingListAdapter; import com.tengshisoft.commonmodule.beans.BuildingListBean; import com.tengshisoft.commonmodule.nets.GridApis; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/fragment/CommunityListFragment.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/fragment/CommunityListFragment.java index 5fcfd75..34cc079 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/fragment/CommunityListFragment.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/fragment/CommunityListFragment.java @@ -11,7 +11,7 @@ import androidx.recyclerview.widget.RecyclerView; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.adapters.CommunityAreaListAdapter; import com.tengshisoft.commonmodule.beans.CommunityAreaListBean; import com.tengshisoft.commonmodule.nets.GridApis; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/fragment/HouseFragment.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/fragment/HouseFragment.java index 467fe15..d3312d7 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/fragment/HouseFragment.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/fragment/HouseFragment.java @@ -11,7 +11,7 @@ import androidx.recyclerview.widget.RecyclerView; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.adapters.HouseListAdapter; import com.tengshisoft.commonmodule.beans.HouseListBean; import com.tengshisoft.commonmodule.nets.GridApis; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/fragment/PersonLibFragment.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/fragment/PersonLibFragment.java index cf0f086..1b4592c 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/fragment/PersonLibFragment.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/fragment/PersonLibFragment.java @@ -32,8 +32,8 @@ public class PersonLibFragment extends BaseFragment { TextView mTvBase; @BindView(R2.id.tv_register) TextView mTvRegister; - @BindView(R2.id.tv_float) - TextView mTvFloat; +// @BindView(R2.id.tv_float) +// TextView mTvFloat; @BindView(R2.id.tv_rear) TextView mTvRear; @BindView(R2.id.tv_crime) @@ -60,11 +60,11 @@ public class PersonLibFragment extends BaseFragment { mSrlView.setEnableLoadMore(false); // mTvBase.setOnClickListener(v -> startPage(PathConfig.PATH_MODULE_GRID_ACTIVITY_POPULACE_BASE_LIST));//基础信息 mTvRegisterPeople.setOnClickListener(v -> startPage(PathConfig.PATH_MODULE_GRID_ACTIVITY_POPULACE_BASE_LIST));//户籍人口 - mTvExtra.setOnClickListener(v -> startPage(PathConfig.PATH_MODULE_GRID_ACTIVITY_POPULACE_EXIRT_LIST));//非户籍人口 + mTvExtra.setOnClickListener(v -> startPage(PathConfig.PATH_MODULE_GRID_ACTIVITY_POPULACE_MIGRANT_LIST));//非户籍人口 -> 流动人员 mTvResid.setOnClickListener(v -> startPage(PathConfig.PATH_MODULE_GRID_ACTIVITY_POPULACE_RESID_LIST));//户籍人口(外出) // mTvRegister.setOnClickListener(v -> startPage(PathConfig.PATH_MODULE_GRID_ACTIVITY_POPULACE_REGISTER_LIST)) // ;//户籍信息 - mTvFloat.setOnClickListener(v -> startPage(PathConfig.PATH_MODULE_GRID_ACTIVITY_POPULACE_MIGRANT_LIST));//流动人员 +// mTvFloat.setOnClickListener(v -> startPage(PathConfig.PATH_MODULE_GRID_ACTIVITY_POPULACE_MIGRANT_LIST));//流动人员 mTvRear.setOnClickListener(v -> startPage(PathConfig.PATH_MODULE_GRID_ACTIVITY_POPULACE_REAR_LIST));//留守人员 mTvCrime.setOnClickListener(v -> startPage(PathConfig.PATH_MODULE_GRID_ACTIVITY_POPULACE_CRIMINAL_LIST));//刑满释放 mTvCorrct.setOnClickListener(v -> startPage(PathConfig.PATH_MODULE_GRID_ACTIVITY_POPULACE_CORRECT_LIST));//社区矫正 diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/fragment/SearchHouseByPersonFragment.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/fragment/SearchHouseByPersonFragment.java index d94b278..ac0491f 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/fragment/SearchHouseByPersonFragment.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/fragment/SearchHouseByPersonFragment.java @@ -11,7 +11,7 @@ import androidx.recyclerview.widget.RecyclerView; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.adapters.HouseListAdapter; import com.tengshisoft.commonmodule.beans.HouseListBean; import com.tengshisoft.commonmodule.nets.GridApis; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/cars/CarManageAddActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/cars/CarManageAddActivity.java index a1ee966..b95da6d 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/cars/CarManageAddActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/cars/CarManageAddActivity.java @@ -18,7 +18,7 @@ import com.alibaba.android.arouter.launcher.ARouter; import com.bigkoo.pickerview.builder.OptionsPickerBuilder; import com.bigkoo.pickerview.view.OptionsPickerView; import com.google.gson.Gson; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.beans.AreaGridListBean; import com.tengshisoft.commonmodule.beans.SaveCarBean; import com.tengshisoft.commonmodule.beans.SuccessBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/cars/CarManageDetailActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/cars/CarManageDetailActivity.java index a2893fb..2f8615a 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/cars/CarManageDetailActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/cars/CarManageDetailActivity.java @@ -12,7 +12,7 @@ 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.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.scwang.smart.refresh.layout.SmartRefreshLayout; import com.tengshisoft.commonmodule.adapters.CarBelongPersonAdapter; import com.tengshisoft.commonmodule.adapters.CarUsePersonAdapter; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/cars/CarManageEditActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/cars/CarManageEditActivity.java index 1b918c2..8a8631f 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/cars/CarManageEditActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/cars/CarManageEditActivity.java @@ -18,7 +18,7 @@ import com.alibaba.android.arouter.launcher.ARouter; import com.bigkoo.pickerview.builder.OptionsPickerBuilder; import com.bigkoo.pickerview.view.OptionsPickerView; import com.google.gson.Gson; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.beans.AreaGridListBean; import com.tengshisoft.commonmodule.beans.CarDetailBean; import com.tengshisoft.commonmodule.beans.SaveCarBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/cars/CarManageListActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/cars/CarManageListActivity.java index b19a8f8..c7b9145 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/cars/CarManageListActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/cars/CarManageListActivity.java @@ -16,7 +16,7 @@ import android.widget.TextView; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; import com.gyf.immersionbar.ImmersionBar; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.jakewharton.rxbinding3.widget.RxTextView; import com.scwang.smart.refresh.layout.SmartRefreshLayout; import com.tengshisoft.commonmodule.adapters.CarListAdapter; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/cars/CarPersonEditActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/cars/CarPersonEditActivity.java index a6f1f50..07036fb 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/cars/CarPersonEditActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/cars/CarPersonEditActivity.java @@ -11,7 +11,7 @@ import com.alibaba.android.arouter.facade.annotation.Route; import com.bigkoo.pickerview.builder.TimePickerBuilder; import com.bigkoo.pickerview.view.TimePickerView; import com.google.gson.Gson; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.beans.CarBelongPersonDetailBean; import com.tengshisoft.commonmodule.beans.CarUsePersonDetailBean; import com.tengshisoft.commonmodule.beans.SaveCarBelongPersonBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/components/ComponentAddActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/components/ComponentAddActivity.java index 46c0b98..c78456a 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/components/ComponentAddActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/components/ComponentAddActivity.java @@ -36,7 +36,7 @@ import com.baidu.mapapi.model.LatLng; import com.bigkoo.pickerview.builder.OptionsPickerBuilder; import com.bigkoo.pickerview.view.OptionsPickerView; import com.google.gson.Gson; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.beans.AreaGridListBean; import com.tengshisoft.commonmodule.beans.ComponentSaveBean; import com.tengshisoft.commonmodule.beans.ComponentTypeBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/components/ComponentEditActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/components/ComponentEditActivity.java index 38ef82e..ba79c24 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/components/ComponentEditActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/components/ComponentEditActivity.java @@ -32,7 +32,7 @@ import com.baidu.mapapi.model.LatLng; import com.bigkoo.pickerview.builder.OptionsPickerBuilder; import com.bigkoo.pickerview.view.OptionsPickerView; import com.google.gson.Gson; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.beans.AreaGridListBean; import com.tengshisoft.commonmodule.beans.ComponentDetailBean; import com.tengshisoft.commonmodule.beans.ComponentSaveBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/components/ComponentsListActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/components/ComponentsListActivity.java index 0a40f71..f93bd49 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/components/ComponentsListActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/components/ComponentsListActivity.java @@ -16,7 +16,7 @@ import android.widget.TextView; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; import com.gyf.immersionbar.ImmersionBar; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.scwang.smart.refresh.layout.SmartRefreshLayout; import com.tengshisoft.commonmodule.adapters.ComponentAdapter; import com.tengshisoft.commonmodule.beans.ComponentListBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/components/DepartmentSelActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/components/DepartmentSelActivity.java index cc7ad82..2b0d6e6 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/components/DepartmentSelActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/components/DepartmentSelActivity.java @@ -11,7 +11,7 @@ import com.alibaba.android.arouter.facade.annotation.Route; import com.google.android.flexbox.FlexDirection; import com.google.android.flexbox.FlexWrap; import com.google.android.flexbox.FlexboxLayoutManager; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.scwang.smart.refresh.layout.SmartRefreshLayout; import com.tengshisoft.commonmodule.R2; import com.tengshisoft.commonmodule.adapters.ChooseDeptAdapter; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/locus/WorkLocusActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/locus/WorkLocusActivity.java index 2c7f0d5..6fdbf57 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/locus/WorkLocusActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/locus/WorkLocusActivity.java @@ -33,7 +33,7 @@ import com.bumptech.glide.Glide; import com.bumptech.glide.load.resource.bitmap.CircleCrop; import com.bumptech.glide.request.RequestOptions; import com.gyf.immersionbar.ImmersionBar; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.adapters.LocusStepAdapter; import com.tengshisoft.commonmodule.beans.DrawMapLineBean; import com.tengshisoft.commonmodule.beans.LocationPointBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/orgmanage/NonPublicOrgAddActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/orgmanage/NonPublicOrgAddActivity.java index 1b5d248..94591e8 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/orgmanage/NonPublicOrgAddActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/orgmanage/NonPublicOrgAddActivity.java @@ -36,7 +36,7 @@ import com.bigkoo.pickerview.view.TimePickerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.google.gson.Gson; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.beans.AreaGridListBean; import com.tengshisoft.commonmodule.beans.SaveNonPublicOrgBean; import com.tengshisoft.commonmodule.beans.SuccessBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/orgmanage/NonPublicOrgDetailActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/orgmanage/NonPublicOrgDetailActivity.java index 8442127..d4c6582 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/orgmanage/NonPublicOrgDetailActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/orgmanage/NonPublicOrgDetailActivity.java @@ -25,7 +25,7 @@ import com.baidu.mapapi.map.TextureMapView; import com.baidu.mapapi.model.LatLng; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.beans.NonPublicOrgDetailBean; import com.tengshisoft.commonmodule.beans.SuccessBean; import com.tengshisoft.commonmodule.nets.GridApis; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/orgmanage/NonPublicOrgEditActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/orgmanage/NonPublicOrgEditActivity.java index 769ba0e..0e27dc0 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/orgmanage/NonPublicOrgEditActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/orgmanage/NonPublicOrgEditActivity.java @@ -36,7 +36,7 @@ import com.bigkoo.pickerview.view.TimePickerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.google.gson.Gson; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.beans.AreaGridListBean; import com.tengshisoft.commonmodule.beans.NonPublicOrgDetailBean; import com.tengshisoft.commonmodule.beans.SaveNonPublicOrgBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/orgmanage/NonPublicOrgListActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/orgmanage/NonPublicOrgListActivity.java index 7163bfa..ac27108 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/orgmanage/NonPublicOrgListActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/orgmanage/NonPublicOrgListActivity.java @@ -15,7 +15,7 @@ import android.widget.TextView; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; import com.gyf.immersionbar.ImmersionBar; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.jakewharton.rxbinding3.widget.RxTextView; import com.scwang.smart.refresh.layout.SmartRefreshLayout; import com.tengshisoft.commonmodule.adapters.NonPublicOrgListAdapter; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/orgmanage/SocialOrgAddActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/orgmanage/SocialOrgAddActivity.java index 5e64268..eab0b33 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/orgmanage/SocialOrgAddActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/orgmanage/SocialOrgAddActivity.java @@ -38,7 +38,7 @@ import com.bigkoo.pickerview.view.TimePickerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.google.gson.Gson; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.beans.AreaGridListBean; import com.tengshisoft.commonmodule.beans.SaveSocialOrgBean; import com.tengshisoft.commonmodule.beans.SuccessBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/orgmanage/SocialOrgDetailActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/orgmanage/SocialOrgDetailActivity.java index 99d098d..4b003be 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/orgmanage/SocialOrgDetailActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/orgmanage/SocialOrgDetailActivity.java @@ -25,7 +25,7 @@ import com.baidu.mapapi.map.TextureMapView; import com.baidu.mapapi.model.LatLng; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.beans.SocialOrgDetailBean; import com.tengshisoft.commonmodule.beans.SuccessBean; import com.tengshisoft.commonmodule.nets.GridApis; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/orgmanage/SocialOrgEditActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/orgmanage/SocialOrgEditActivity.java index a237343..3ceb918 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/orgmanage/SocialOrgEditActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/orgmanage/SocialOrgEditActivity.java @@ -38,7 +38,7 @@ import com.bigkoo.pickerview.view.TimePickerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.google.gson.Gson; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.beans.AreaGridListBean; import com.tengshisoft.commonmodule.beans.SaveSocialOrgBean; import com.tengshisoft.commonmodule.beans.SocialOrgDetailBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/orgmanage/SocialOrgListActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/orgmanage/SocialOrgListActivity.java index 63df4e6..0e51c05 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/orgmanage/SocialOrgListActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/orgmanage/SocialOrgListActivity.java @@ -15,7 +15,7 @@ import android.widget.TextView; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; import com.gyf.immersionbar.ImmersionBar; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.jakewharton.rxbinding3.widget.RxTextView; import com.scwang.smart.refresh.layout.SmartRefreshLayout; import com.tengshisoft.commonmodule.adapters.SocialOrgListAdapter; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/EnterprisePatrolAddActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/EnterprisePatrolAddActivity.java index 66a4a2d..8d4b8f8 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/EnterprisePatrolAddActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/EnterprisePatrolAddActivity.java @@ -21,7 +21,7 @@ import com.alibaba.android.arouter.launcher.ARouter; import com.bigkoo.pickerview.builder.TimePickerBuilder; import com.bigkoo.pickerview.view.TimePickerView; import com.google.gson.Gson; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.beans.SaveEnterprisePatrolBean; import com.tengshisoft.commonmodule.beans.SuccessBean; import com.tengshisoft.commonmodule.nets.GridApis; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/EnterprisePatrolDetailActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/EnterprisePatrolDetailActivity.java index c91d11e..90cc671 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/EnterprisePatrolDetailActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/EnterprisePatrolDetailActivity.java @@ -13,7 +13,7 @@ import android.widget.TextView; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.beans.PatrolEnterpriseDetailBean; import com.tengshisoft.commonmodule.beans.SuccessBean; import com.tengshisoft.commonmodule.nets.GridApis; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/EnterprisePatrolEditActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/EnterprisePatrolEditActivity.java index 049b51c..8117aa5 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/EnterprisePatrolEditActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/EnterprisePatrolEditActivity.java @@ -18,7 +18,7 @@ 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.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.beans.PatrolKeyPlaceDetailBean; import com.tengshisoft.commonmodule.beans.SaveEnterprisePatrolBean; import com.tengshisoft.commonmodule.beans.SavePatrolPenalBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/EnterprisePatrolListActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/EnterprisePatrolListActivity.java index ce8aa63..59e37b2 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/EnterprisePatrolListActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/EnterprisePatrolListActivity.java @@ -9,7 +9,7 @@ import android.widget.TextView; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.scwang.smart.refresh.layout.SmartRefreshLayout; import com.tengshisoft.commonmodule.adapters.PatrolEnterpriseListAdapter; import com.tengshisoft.commonmodule.beans.KeyPlaceDetailBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/ExpressPatrolAddActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/ExpressPatrolAddActivity.java index e857cfb..05074cc 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/ExpressPatrolAddActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/ExpressPatrolAddActivity.java @@ -21,7 +21,7 @@ import com.alibaba.android.arouter.launcher.ARouter; import com.bigkoo.pickerview.builder.TimePickerBuilder; import com.bigkoo.pickerview.view.TimePickerView; import com.google.gson.Gson; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.beans.SavePatrolExpressBean; import com.tengshisoft.commonmodule.beans.SuccessBean; import com.tengshisoft.commonmodule.nets.GridApis; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/ExpressPatrolDetailActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/ExpressPatrolDetailActivity.java index 6cc2ef1..b9fcd56 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/ExpressPatrolDetailActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/ExpressPatrolDetailActivity.java @@ -16,7 +16,7 @@ import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.beans.PatrolExpressDetailBean; import com.tengshisoft.commonmodule.beans.SuccessBean; import com.tengshisoft.commonmodule.nets.GridApis; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/ExpressPatrolEditActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/ExpressPatrolEditActivity.java index f4c5e6c..a588a6e 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/ExpressPatrolEditActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/ExpressPatrolEditActivity.java @@ -20,7 +20,7 @@ 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.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.beans.PatrolExpressDetailBean; import com.tengshisoft.commonmodule.beans.SavePatrolExpressBean; import com.tengshisoft.commonmodule.beans.SuccessBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/ExpressPatrolListActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/ExpressPatrolListActivity.java index e691629..f44d6a5 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/ExpressPatrolListActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/ExpressPatrolListActivity.java @@ -10,7 +10,7 @@ import android.widget.TextView; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.scwang.smart.refresh.layout.SmartRefreshLayout; import com.tengshisoft.commonmodule.adapters.PatrolExpressListAdapter; import com.tengshisoft.commonmodule.beans.ExpressDetailBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/KeyAreaPatrolAddActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/KeyAreaPatrolAddActivity.java index 3809b26..e75ad90 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/KeyAreaPatrolAddActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/KeyAreaPatrolAddActivity.java @@ -21,7 +21,7 @@ import com.alibaba.android.arouter.launcher.ARouter; import com.bigkoo.pickerview.builder.TimePickerBuilder; import com.bigkoo.pickerview.view.TimePickerView; import com.google.gson.Gson; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.beans.SavePatrolKeyAreaBean; import com.tengshisoft.commonmodule.beans.SuccessBean; import com.tengshisoft.commonmodule.nets.GridApis; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/KeyAreaPatrolDetailActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/KeyAreaPatrolDetailActivity.java index b3e953b..16f934b 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/KeyAreaPatrolDetailActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/KeyAreaPatrolDetailActivity.java @@ -16,7 +16,7 @@ import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.beans.PatrolKeyAreaDetailBean; import com.tengshisoft.commonmodule.beans.SuccessBean; import com.tengshisoft.commonmodule.nets.GridApis; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/KeyAreaPatrolEditActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/KeyAreaPatrolEditActivity.java index 3cb72e5..4697e80 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/KeyAreaPatrolEditActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/KeyAreaPatrolEditActivity.java @@ -18,7 +18,7 @@ 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.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.beans.PatrolKeyAreaDetailBean; import com.tengshisoft.commonmodule.beans.SavePatrolKeyAreaBean; import com.tengshisoft.commonmodule.beans.SuccessBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/KeyAreaPatrolListActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/KeyAreaPatrolListActivity.java index e4c6932..3961778 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/KeyAreaPatrolListActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/KeyAreaPatrolListActivity.java @@ -11,7 +11,7 @@ import android.widget.TextView; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.scwang.smart.refresh.layout.SmartRefreshLayout; import com.tengshisoft.commonmodule.adapters.PatrolKeyAreaListAdapter; import com.tengshisoft.commonmodule.beans.KeyAreaDetailBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/KeyPlacePatrolAddActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/KeyPlacePatrolAddActivity.java index e11bf8d..96cb591 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/KeyPlacePatrolAddActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/KeyPlacePatrolAddActivity.java @@ -21,7 +21,7 @@ import com.alibaba.android.arouter.launcher.ARouter; import com.bigkoo.pickerview.builder.TimePickerBuilder; import com.bigkoo.pickerview.view.TimePickerView; import com.google.gson.Gson; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.beans.SavePatrolKeyPlaceBean; import com.tengshisoft.commonmodule.beans.SuccessBean; import com.tengshisoft.commonmodule.nets.GridApis; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/KeyPlacePatrolDetailActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/KeyPlacePatrolDetailActivity.java index 155f1aa..62e05b4 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/KeyPlacePatrolDetailActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/KeyPlacePatrolDetailActivity.java @@ -16,7 +16,7 @@ import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.beans.PatrolKeyPlaceDetailBean; import com.tengshisoft.commonmodule.beans.SuccessBean; import com.tengshisoft.commonmodule.nets.GridApis; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/KeyPlacePatrolEditActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/KeyPlacePatrolEditActivity.java index a4ddbd2..8fbfdea 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/KeyPlacePatrolEditActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/KeyPlacePatrolEditActivity.java @@ -22,7 +22,7 @@ import com.alibaba.android.arouter.launcher.ARouter; import com.bigkoo.pickerview.builder.TimePickerBuilder; import com.bigkoo.pickerview.view.TimePickerView; import com.google.gson.Gson; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.beans.PatrolKeyPlaceDetailBean; import com.tengshisoft.commonmodule.beans.SavePatrolKeyPlaceBean; import com.tengshisoft.commonmodule.beans.SuccessBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/KeyPlacePatrolListActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/KeyPlacePatrolListActivity.java index 534fa4c..c499f78 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/KeyPlacePatrolListActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/KeyPlacePatrolListActivity.java @@ -10,7 +10,7 @@ import android.widget.TextView; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.scwang.smart.refresh.layout.SmartRefreshLayout; import com.tengshisoft.commonmodule.adapters.PatrolKeyPlaceListAdapter; import com.tengshisoft.commonmodule.beans.KeyPlaceDetailBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/KeyRoadCaseAddActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/KeyRoadCaseAddActivity.java index 838250b..1a53cea 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/KeyRoadCaseAddActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/KeyRoadCaseAddActivity.java @@ -15,7 +15,7 @@ import com.bigkoo.pickerview.builder.TimePickerBuilder; import com.bigkoo.pickerview.view.OptionsPickerView; import com.bigkoo.pickerview.view.TimePickerView; import com.google.gson.Gson; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.beans.AreaGridListBean; import com.tengshisoft.commonmodule.beans.SaveKeyRoadCaseBean; import com.tengshisoft.commonmodule.beans.SuccessBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/KeyRoadCaseEditActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/KeyRoadCaseEditActivity.java index 192f1c5..b2bbe79 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/KeyRoadCaseEditActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/KeyRoadCaseEditActivity.java @@ -16,7 +16,7 @@ import com.bigkoo.pickerview.builder.TimePickerBuilder; import com.bigkoo.pickerview.view.OptionsPickerView; import com.bigkoo.pickerview.view.TimePickerView; import com.google.gson.Gson; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.beans.AreaGridListBean; import com.tengshisoft.commonmodule.beans.KeyRoadCaseDetailBean; import com.tengshisoft.commonmodule.beans.SaveKeyRoadCaseBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/KeyRoadCaseListActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/KeyRoadCaseListActivity.java index 36bfbe9..2ada359 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/KeyRoadCaseListActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/KeyRoadCaseListActivity.java @@ -16,7 +16,7 @@ import android.widget.TextView; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; import com.gyf.immersionbar.ImmersionBar; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.jakewharton.rxbinding3.widget.RxTextView; import com.scwang.smart.refresh.layout.SmartRefreshLayout; import com.tengshisoft.commonmodule.adapters.KeyRoadCaseAdapter; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/PenalPatrolAddActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/PenalPatrolAddActivity.java index c484e50..07d3c3c 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/PenalPatrolAddActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/PenalPatrolAddActivity.java @@ -21,7 +21,7 @@ import com.alibaba.android.arouter.launcher.ARouter; import com.bigkoo.pickerview.builder.TimePickerBuilder; import com.bigkoo.pickerview.view.TimePickerView; import com.google.gson.Gson; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.beans.SavePatrolPenalBean; import com.tengshisoft.commonmodule.beans.SuccessBean; import com.tengshisoft.commonmodule.nets.GridApis; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/PenalPatrolDetailActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/PenalPatrolDetailActivity.java index acb64b8..90b5c53 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/PenalPatrolDetailActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/PenalPatrolDetailActivity.java @@ -26,7 +26,7 @@ import android.widget.TextView; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.beans.PatrolPenalDetailBean; import com.tengshisoft.commonmodule.beans.SuccessBean; import com.tengshisoft.commonmodule.nets.GridApis; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/PenalPatrolEditActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/PenalPatrolEditActivity.java index 76255cb..1559c09 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/PenalPatrolEditActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/PenalPatrolEditActivity.java @@ -18,7 +18,7 @@ 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.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.beans.PatrolPenalDetailBean; import com.tengshisoft.commonmodule.beans.SavePatrolPenalBean; import com.tengshisoft.commonmodule.beans.SuccessBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/PenalPatrolListActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/PenalPatrolListActivity.java index 3975cdf..fc562d7 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/PenalPatrolListActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/PenalPatrolListActivity.java @@ -13,7 +13,7 @@ import android.widget.TextView; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.scwang.smart.refresh.layout.SmartRefreshLayout; import com.tengshisoft.commonmodule.adapters.PatrolPenalListAdapter; import com.tengshisoft.commonmodule.beans.PatrolPenalListBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/CensusBaseActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/CensusBaseActivity.java index 8ae91cc..24c11fa 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/CensusBaseActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/CensusBaseActivity.java @@ -20,7 +20,7 @@ import androidx.recyclerview.widget.RecyclerView; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.scwang.smart.refresh.layout.SmartRefreshLayout; import com.tengshisoft.commonmodule.adapters.CensusPersonAdapter; import com.tengshisoft.commonmodule.beans.AreaGridListBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/CensusBaseDetailActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/CensusBaseDetailActivity.java index da62bb2..c7f959f 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/CensusBaseDetailActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/CensusBaseDetailActivity.java @@ -7,7 +7,7 @@ import android.widget.Button; import android.widget.TextView; import com.alibaba.android.arouter.facade.annotation.Route; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.beans.SuccessBean; import com.tengshisoft.commonmodule.nets.GridApis; import com.tengshisoft.gridmodule.R; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/CensusBaseEnterActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/CensusBaseEnterActivity.java index 17f9359..9e548d8 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/CensusBaseEnterActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/CensusBaseEnterActivity.java @@ -21,7 +21,7 @@ import com.bigkoo.pickerview.builder.TimePickerBuilder; import com.bigkoo.pickerview.view.OptionsPickerView; import com.bigkoo.pickerview.view.TimePickerView; import com.google.gson.Gson; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.beans.AreaGridListBean; import com.tengshisoft.commonmodule.beans.SavePersonBean; import com.tengshisoft.commonmodule.beans.SuccessBean; @@ -229,12 +229,8 @@ public class CensusBaseEnterActivity extends BaseActivity { DicBean bean2 = new DicBean(); bean2.setDataName("户籍人口(外出)"); bean2.setDataId("2"); - DicBean bean3 = new DicBean(); - bean3.setDataName("非户籍人口"); - bean3.setDataId("3"); mTypeList.add(bean1); mTypeList.add(bean2); - mTypeList.add(bean3); mTvType.setOnClickListener(v -> onShowType()); } @@ -558,9 +554,9 @@ public class CensusBaseEnterActivity extends BaseActivity { mSelTypeBean.setDataId("2"); break; case "3": - mSelTypeBean.setDataName("非户籍人口"); + mSelTypeBean.setDataName("流动人口"); mSelTypeBean.setDataId("3"); - mTvType.setText("非户籍人口"); + mTvType.setText("流动人口"); break; } } diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/CensusBaseSearchActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/CensusBaseSearchActivity.java index d163f0b..b1a8ad4 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/CensusBaseSearchActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/CensusBaseSearchActivity.java @@ -25,7 +25,7 @@ import com.alibaba.android.arouter.launcher.ARouter; import com.bigkoo.pickerview.builder.OptionsPickerBuilder; import com.bigkoo.pickerview.view.OptionsPickerView; import com.google.gson.Gson; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.adapters.CensusPersonAdapter; import com.tengshisoft.commonmodule.beans.AreaGridListBean; import com.tengshisoft.commonmodule.beans.CensusPersonBean; @@ -139,7 +139,7 @@ public class CensusBaseSearchActivity extends BaseActivity { mEtSearchCentent.setOnEditorActionListener((v, actionId, event) -> { if (actionId == EditorInfo.IME_ACTION_SEARCH) { - hideSoftKeyboard(); + hideSoftKeyboard(mEtSearchCentent); mEtSearchCentent.clearFocus(); mKeywords = v.getText().toString(); setStateView(13); @@ -153,7 +153,7 @@ public class CensusBaseSearchActivity extends BaseActivity { mBtnSearch.setOnClickListener(v -> { String keywords = mEtSearchCentent.getText().toString().trim(); if (!TextUtils.isEmpty(keywords)) { - hideSoftKeyboard(); + hideSoftKeyboard(mEtSearchCentent); mKeywords = keywords; mEtSearchCentent.clearFocus(); setStateView(13); @@ -192,12 +192,8 @@ public class CensusBaseSearchActivity extends BaseActivity { DicBean bean2 = new DicBean(); bean2.setDataName("户籍人口(外出)"); bean2.setDataId("2"); - DicBean bean3 = new DicBean(); - bean3.setDataName("非户籍人口"); - bean3.setDataId("3"); mTypeList.add(bean1); mTypeList.add(bean2); - mTypeList.add(bean3); mTvGrid.setOnClickListener(v -> onShowGrid()); mTvType.setOnClickListener(v -> onShowType()); mBtnSave.setOnClickListener(v -> doSaveEdit()); diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/CensusExitrActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/CensusExitrActivity.java index 3c5a8d6..f0d3d69 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/CensusExitrActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/CensusExitrActivity.java @@ -20,7 +20,7 @@ import androidx.recyclerview.widget.RecyclerView; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.scwang.smart.refresh.layout.SmartRefreshLayout; import com.tengshisoft.commonmodule.adapters.CensusPersonAdapter; import com.tengshisoft.commonmodule.beans.AreaGridListBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/CensusResidsActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/CensusResidsActivity.java index 438ee9e..9b18332 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/CensusResidsActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/CensusResidsActivity.java @@ -20,7 +20,7 @@ import androidx.recyclerview.widget.RecyclerView; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.scwang.smart.refresh.layout.SmartRefreshLayout; import com.tengshisoft.commonmodule.adapters.CensusPersonAdapter; import com.tengshisoft.commonmodule.beans.AreaGridListBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/CensusYoungAddActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/CensusYoungAddActivity.java index 401763d..a561a03 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/CensusYoungAddActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/CensusYoungAddActivity.java @@ -15,7 +15,7 @@ import com.alibaba.android.arouter.facade.annotation.Route; import com.bigkoo.pickerview.builder.OptionsPickerBuilder; import com.bigkoo.pickerview.view.OptionsPickerView; import com.google.gson.Gson; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.beans.CensusYoungDetailBean; import com.tengshisoft.commonmodule.beans.SaveYoungBean; import com.tengshisoft.commonmodule.beans.SuccessBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/CensusYoungListActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/CensusYoungListActivity.java index e5185f7..74a9dd3 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/CensusYoungListActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/CensusYoungListActivity.java @@ -13,7 +13,7 @@ import android.widget.TextView; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.scwang.smart.refresh.layout.SmartRefreshLayout; import com.tengshisoft.commonmodule.adapters.CensusYoungAdapter; import com.tengshisoft.commonmodule.beans.CensusYoungListBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/DicSelActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/DicSelActivity.java index 7da33c7..77ada7e 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/DicSelActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/DicSelActivity.java @@ -10,7 +10,7 @@ import android.widget.EditText; import android.widget.LinearLayout; import com.alibaba.android.arouter.facade.annotation.Route; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.scwang.smart.refresh.layout.SmartRefreshLayout; import com.tengshisoft.commonmodule.adapters.DicSelAdapter; import com.tengshisoft.commonmodule.nets.GridApis; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/YoungCaseAddActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/YoungCaseAddActivity.java index 0dd4347..d3d8d3c 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/YoungCaseAddActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/YoungCaseAddActivity.java @@ -12,7 +12,7 @@ import com.alibaba.android.arouter.facade.annotation.Route; import com.bigkoo.pickerview.builder.TimePickerBuilder; import com.bigkoo.pickerview.view.TimePickerView; import com.google.gson.Gson; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.adapters.YoungCasePersonAdapter; import com.tengshisoft.commonmodule.beans.SaveYoungCaseBean; import com.tengshisoft.commonmodule.beans.SuccessBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/YoungCaseDetailActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/YoungCaseDetailActivity.java index e571ebe..e6f5ff3 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/YoungCaseDetailActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/YoungCaseDetailActivity.java @@ -10,7 +10,7 @@ import android.widget.TextView; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.adapters.YoungCasePersonAdapter; import com.tengshisoft.commonmodule.beans.SaveYoungCaseBean; import com.tengshisoft.commonmodule.beans.SuccessBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/YoungCaseListActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/YoungCaseListActivity.java index 3687c5c..259e79e 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/YoungCaseListActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/YoungCaseListActivity.java @@ -15,7 +15,7 @@ import android.widget.TextView; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; import com.gyf.immersionbar.ImmersionBar; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.jakewharton.rxbinding3.widget.RxTextView; import com.scwang.smart.refresh.layout.SmartRefreshLayout; import com.tengshisoft.commonmodule.R2; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/fragments/CensusBaseGridListFragment.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/fragments/CensusBaseGridListFragment.java index 6a44d6c..59768eb 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/fragments/CensusBaseGridListFragment.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/fragments/CensusBaseGridListFragment.java @@ -11,7 +11,7 @@ import androidx.recyclerview.widget.RecyclerView; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.scwang.smart.refresh.layout.SmartRefreshLayout; import com.tengshisoft.commonmodule.adapters.CommunityAreaListAdapter; import com.tengshisoft.commonmodule.beans.CommunityAreaListBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/normal/CensusMigrantAddActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/normal/CensusMigrantAddActivity.java index bf510f9..de3cf5b 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/normal/CensusMigrantAddActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/normal/CensusMigrantAddActivity.java @@ -1,9 +1,11 @@ package com.tengshisoft.gridmodule.incident.activitys.populace.normal; import android.app.ProgressDialog; +import android.content.Intent; import android.graphics.Color; +import android.text.Editable; import android.text.TextUtils; -import android.view.View; +import android.view.inputmethod.EditorInfo; import android.widget.Button; import android.widget.EditText; import android.widget.ImageView; @@ -11,36 +13,45 @@ import android.widget.LinearLayout; import android.widget.Switch; 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.bigkoo.pickerview.builder.OptionsPickerBuilder; import com.bigkoo.pickerview.builder.TimePickerBuilder; import com.bigkoo.pickerview.view.OptionsPickerView; import com.bigkoo.pickerview.view.TimePickerView; import com.google.gson.Gson; -import com.hjq.toast.ToastUtils; +import com.hjq.toast.Toaster; +import com.tengshisoft.commonmodule.beans.AreaGridListBean; import com.tengshisoft.commonmodule.beans.MigrantDetailBean; import com.tengshisoft.commonmodule.beans.SaveFloatingBean; import com.tengshisoft.commonmodule.beans.SuccessBean; import com.tengshisoft.commonmodule.nets.GridApis; import com.tengshisoft.gridmodule.R; import com.tengshisoft.gridmodule.R2; +import com.tenlionsoft.baselib.app.BaseAppContext; import com.tenlionsoft.baselib.constant.DicIds; import com.tenlionsoft.baselib.constant.PathConfig; +import com.tenlionsoft.baselib.core.beans.AreaBean; import com.tenlionsoft.baselib.core.beans.DicBean; -import com.tenlionsoft.baselib.core.beans.PersonSearchBean; +import com.tenlionsoft.baselib.core.beans.PersonFlowSearchBean; import com.tenlionsoft.baselib.core.retrofit_net.RetrofitManager; import com.tenlionsoft.baselib.core.retrofit_net.api.BaseApiService; import com.tenlionsoft.baselib.core.widget.base.BaseActivity; +import com.tenlionsoft.baselib.core.widget.views.AreaChooseDialog; +import com.tenlionsoft.baselib.interfaces.TextChange; import com.tenlionsoft.baselib.utils.ExceptionHandler; +import com.tenlionsoft.baselib.utils.IDCard; import com.tenlionsoft.baselib.utils.RegexUtils; import com.tenlionsoft.baselib.utils.TimeUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tenlionsoft.baselib.utils.UIUtil; import com.tenlionsoft.baselib.utils.UserLgUtils; import java.text.SimpleDateFormat; import java.util.List; -import androidx.cardview.widget.CardView; import butterknife.BindView; import butterknife.ButterKnife; import butterknife.Unbinder; @@ -57,8 +68,45 @@ import okhttp3.RequestBody; */ @Route(path = PathConfig.PATH_MODULE_GRID_ACTIVITY_POPULACE_MIGRANT_ADD) public class CensusMigrantAddActivity extends BaseActivity { - @BindView(R2.id.ll_into_content) - LinearLayout mLlContent; + //人口基础信息 + @BindView(R2.id.et_identity) + EditText mEtIdentity;//身份证号 + @BindView(R2.id.et_name) + EditText mEtName;//姓名 + @BindView(R2.id.et_once_name) + EditText mEtOnceName;//曾用名--- + @BindView(R2.id.tv_gender) + TextView mTvGender;//性别 + @BindView(R2.id.tv_birth) + TextView mTvBirth;//生日 + @BindView(R2.id.tv_nation) + TextView mTvNation;//民族 + @BindView(R2.id.tv_marry) + TextView mTvMarry;//婚姻 + @BindView(R2.id.tv_political) + TextView mTvPolitical;//政治面貌 + @BindView(R2.id.tv_edu) + TextView mTvEdu;//学历 + @BindView(R2.id.tv_religion) + TextView mTvReligion;//宗教 + @BindView(R2.id.tv_work_type) + TextView mTvWorkType;//职业类别 + @BindView(R2.id.et_work) + EditText mTvWork;//职业 + @BindView(R2.id.et_work_space) + EditText mEtWorkSpace;//服务处所 + @BindView(R2.id.et_phone) + EditText mEtPhone;//联系方式 + @BindView(R2.id.et_census_detail) + EditText mEtCensusDetail;//户籍地详址 + @BindView(R2.id.et_cur_detail) + EditText mEtCurDetail;//现在详细地址 + @BindView(R2.id.tv_area) + TextView mTvArea;//所在地区 + @BindView(R2.id.tv_grid) + TextView mTvGrid;//所在网格 + + @BindView(R2.id.tv_cause) TextView mTvCause;//流入原因-- @BindView(R2.id.tv_card_type) @@ -86,32 +134,47 @@ public class CensusMigrantAddActivity extends BaseActivity { @BindView(R2.id.iv_clear) ImageView mIvClear; - //基础信息 - @BindView(R2.id.cv_base_info) - LinearLayout mCvBaseInfo;//基础信息 - @BindView(R2.id.tv_base_name) - TextView mTvBaseName; - @BindView(R2.id.tv_base_gender) - TextView mTvBaseGender; - @BindView(R2.id.tv_base_native) - TextView mTvBaseNative; - @BindView(R2.id.tv_base_phone) - TextView mTvBasePhone; - @BindView(R2.id.tv_base_cur_loc) - TextView mTvBaseCurLoc; - @BindView(R2.id.tv_base_area) - TextView mTvBaseArea; - @BindView(R2.id.tv_base_grid) - TextView mTvBaseGrid; + private List mGenderList; + private List mNationList; + private List mNativeList; + private List mPoliticalList; + private List mEduList; + private List mReligionList; + private List mTypeList;//人口类型 + private List mMarryList; + private DicBean mSelGender;//性别 + private DicBean mSelNation;//名族 + private DicBean mSelPolitical;//政治面貌 + private DicBean mSelEdu;//学历 + private DicBean mSelReligion;//信仰 + private DicBean mSelWorkType;//职业类别 + private DicBean mSelMarry;//婚姻状况 + private OptionsPickerView mGenderPicker; + private OptionsPickerView mNationPicker; + private OptionsPickerView mNativePicker; + private OptionsPickerView mPoliticalPicker; + private OptionsPickerView mEduPicker; + private OptionsPickerView mReligionPicker; + private OptionsPickerView mMarryPicker; + private OptionsPickerView mTypePicker; + private SimpleDateFormat mDateFormat = new SimpleDateFormat("yyyy-MM-dd"); private Unbinder mBind; + private String mId; + private String mSelCensusIds = ""; + private String mSelCurLoc = ""; + private String mSelAreaCode; + private String mSelAreaId; + private String mSelAreaName; + private AreaGridListBean.RowsBean mSelGridBean; + + private TimePickerView mStartPicker; private TimePickerView mEndPicker; private OptionsPickerView mHouseTypePicker; private OptionsPickerView mCardTypePicker; private OptionsPickerView mFlowTypePicker; - private SimpleDateFormat mDateFormat = new SimpleDateFormat("yyyy-MM-dd"); private boolean mIsAttention = false; private List mCardTypeList;//办证类型 private List mHouseTypeList;//住所类型 @@ -119,8 +182,8 @@ public class CensusMigrantAddActivity extends BaseActivity { private String mSelCardType; private String mSelHouseType; - private String mId; private String mSelCause; + private PersonFlowSearchBean mBaseInfoBean; @Override protected int setLayoutId() { @@ -154,9 +217,21 @@ public class CensusMigrantAddActivity extends BaseActivity { refreshView(STATE_LOAD_LOADING); getDetialById(mId); } else { + mSelAreaName = UserLgUtils.getLocationAddress(); + mSelAreaCode = UserLgUtils.getUserAreaCode(); + mTvArea.setText(mSelAreaName); refreshView(STATE_LOAD_SUCCESS); } - mLlContent.setVisibility(View.GONE); + mEtSearchIdCard.setOnEditorActionListener((v, actionId, event) -> { + if (actionId == EditorInfo.IME_ACTION_SEARCH) { + hideSoftKeyboard(); + mEtSearchIdCard.clearFocus(); + doSearchPerson(); + return true; + } else { + return false; + } + }); mBtnSearch.setOnClickListener(v -> doSearchPerson()); mIvClear.setOnClickListener(v -> mEtSearchIdCard.setText("")); @@ -168,6 +243,44 @@ public class CensusMigrantAddActivity extends BaseActivity { mTvCause.setOnClickListener(v -> onShowCauseType()); mBtnConfirm.setOnClickListener(v -> doSubmit()); setEditTextInhibitInputSpeChat(mEtCardNumber); + + mTvGender.setOnClickListener(v -> onShowGender()); + mTvBirth.setOnClickListener(v -> onShowDate(1)); + mTvNation.setOnClickListener(v -> onShowNation());//名族 + mTvMarry.setOnClickListener(v -> onShowMarry());//婚姻状况 + mTvPolitical.setOnClickListener(v -> onShowPolitical());//政治面貌 + mTvEdu.setOnClickListener(v -> onShowEdu());//学历 + mTvReligion.setOnClickListener(v -> onShowReligion());//宗教信仰 + mTvWorkType.setOnClickListener(v -> onShowWorkType());//职业类别 + mTvGrid.setOnClickListener(v -> { + if (TextUtils.isEmpty(mSelAreaCode)) { + ToastUtils.show("请先选择所在地区"); + } else { + ARouter.getInstance() + .build(PathConfig.PATH_MODULE_COMMON_ACTIVITY_SEL_GRID) + .withString("areaCode", mSelAreaCode) + .navigation(mActivity, 15); + } + }); + + mTvArea.setOnClickListener(v -> onShowArea()); + mEtIdentity.addTextChangedListener(new TextChange() { + @Override + public void afterTextChanged(Editable s) { + String idcard = s.toString(); + if (IDCard.IDCardValidate(idcard)) { + String birthDay = IDCard.getBirthDay(idcard); + mTvBirth.setText(birthDay); + } else { + mTvBirth.setText(""); + } + } + }); + Object curGrid = ((BaseAppContext) getApplicationContext()).getGridBean(); + if (curGrid != null && curGrid instanceof AreaGridListBean.RowsBean) { + mSelGridBean = (AreaGridListBean.RowsBean) curGrid; + mTvGrid.setText(mSelGridBean.getGridName()); + } } @@ -178,31 +291,318 @@ public class CensusMigrantAddActivity extends BaseActivity { */ private void getDetialById(String id) { RetrofitManager.getInstance() - .create(GridApis.class) - .getCensusNmigrantDetail(id, UserLgUtils.getToken()) - .subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()) - .subscribe(new Observer() { - @Override - public void onSubscribe(@NonNull Disposable d) { + .create(GridApis.class) + .getCensusNmigrantDetail(id, UserLgUtils.getToken()) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(new Observer() { + @Override + public void onSubscribe(@NonNull Disposable d) { + } + + @Override + public void onNext(@NonNull MigrantDetailBean censusRegisterDetailBean) { + setDataToView(censusRegisterDetailBean, 0); + } + + @Override + public void onError(@NonNull Throwable e) { + refreshView(STATE_LOAD_ERROR); + } + + @Override + public void onComplete() { + + } + }); + } + + /** + * 职业类型 7 + */ + private void onShowWorkType() { + hideSoftKeyboard(); + ARouter.getInstance() + .build(PathConfig.PATH_MODULE_GRID_ACTIVITY_DIC_SEL) + .withBoolean("isSingle", true) + .withString("id", DicIds.DIC_WORK_TYPE) + .navigation(mActivity, 1234); + } + + /** + * 婚姻状况 3 + */ + private void onShowMarry() { + hideSoftKeyboard(); + if (mMarryList != null && mMarryList.size() > 0) { + if (mMarryPicker == null) { + mMarryPicker = new OptionsPickerBuilder(mActivity, (o1, o2, o3, v) -> { + DicBean bean = mMarryList.get(o1); + mSelMarry = bean; + mTvMarry.setText(bean.getDataName()); + }) + .setTitleText("请选择") + .setCancelColor(Color.parseColor("#1189FF")) + .setSubmitColor(Color.parseColor("#1189FF")) + .setTitleColor(Color.parseColor("#1189FF")) + .build(); + mMarryPicker.setPicker(mMarryList); + } + mMarryPicker.show(); + } else { + getDicListByType(DicIds.DIC_MARRIAGE, 3); + } + } + + /** + * 显示地区选择 + */ + private void onShowArea() { + AreaChooseDialog dialog = new AreaChooseDialog + .DialogBuilder(mActivity) + .setDefault(true) + .build(); + dialog.addOnChoseListener((names, id, code) -> { + mSelAreaCode = code; + mSelAreaId = id; + mSelAreaName = names; + mTvArea.setText(names); + mSelGridBean = null; + mTvGrid.setText(""); + dialog.dismiss(); + }); + dialog.show(); + } + + /** + * 选择性别 1 + */ + private void onShowGender() { + hideSoftKeyboard(); + if (mGenderList != null && mGenderList.size() > 0) { + if (mGenderPicker == null) { + mGenderPicker = new OptionsPickerBuilder(mActivity, (options1, options2, options3, v) -> { + DicBean bean = mGenderList.get(options1); + mSelGender = bean; + mTvGender.setText(bean.getDataName()); + }).setTitleText("请选择") + .setCancelColor(Color.parseColor("#1189FF")) + .setSubmitColor(Color.parseColor("#1189FF")) + .setTitleColor(Color.parseColor("#1189FF")) + .build(); + mGenderPicker.setPicker(mGenderList); + } + mGenderPicker.show(); + } else { + getDicListByType(DicIds.DIC_GENDER, 1); + } + } + + /** + * 日期 + * 1 生日 + */ + private void onShowDate(int i) { + hideSoftKeyboard(); + TimePickerView mTimePickerView = new TimePickerBuilder(mActivity, (date, v) -> { + switch (i) { + case 1: + mTvBirth.setText(mDateFormat.format(date)); + break; + } + }) + .setTitleText("请选日期") + .setCancelColor(Color.parseColor("#1189FF")) + .setSubmitColor(Color.parseColor("#1189FF")) + .setType(new boolean[]{true, true, true, false, false, false}) + .setTitleColor(Color.parseColor("#1189FF")) + .build(); + mTimePickerView.show(); + } + + /** + * 选择名族 - 2 + */ + private void onShowNation() { + hideSoftKeyboard(); + if (mNationList != null && mNationList.size() > 0) { + if (mNationPicker == null) { + mNationPicker = new OptionsPickerBuilder(mActivity, (o1, o2, o3, v) -> { + DicBean bean = mNationList.get(o1); + mSelNation = bean; + mTvNation.setText(bean.getDataName()); + }) + .setTitleText("请选择") + .setCancelColor(Color.parseColor("#1189FF")) + .setSubmitColor(Color.parseColor("#1189FF")) + .setTitleColor(Color.parseColor("#1189FF")) + .build(); + mNationPicker.setPicker(mNationList); + } + mNationPicker.show(); + } else { + getDicListByType(DicIds.DIC_NATION, 2); + } + } + + + /** + * 籍贯 - 3 + */ + private void onShowNative() { + hideSoftKeyboard(); + if (mNativeList != null && mNativeList.size() > 0) { + if (mNativePicker == null) { + mNativePicker = new OptionsPickerBuilder(mActivity, (o1, o2, o3, v) -> { + AreaBean bean = mNativeList.get(o1); + }) + .setTitleText("请选择") + .setCancelColor(Color.parseColor("#1189FF")) + .setSubmitColor(Color.parseColor("#1189FF")) + .setTitleColor(Color.parseColor("#1189FF")) + .build(); + mNativePicker.setPicker(mNativeList); + } + mNativePicker.show(); + } else { + getArea1(); + } + } + + /** + * 获取籍贯 + */ + private void getArea1() { + ProgressDialog dialog = UIUtil.initDialog(mActivity, "获取中..."); + dialog.show(); + RetrofitManager.getInstance() + .create(GridApis.class) + .getAreaListByPid("0", UserLgUtils.getToken()) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(new Observer>() { + @Override + public void onSubscribe(Disposable d) { + } + + @Override + public void onNext(List areaListBeans) { + dialog.dismiss(); + if (null != areaListBeans && areaListBeans.size() > 0) { + mNativeList = areaListBeans; + onShowNative(); + } else { + ToastUtils.show("暂无数据"); + } + } + + @Override + public void onError(Throwable e) { + dialog.dismiss(); + ExceptionHandler.handleException(e); + } + + @Override + public void onComplete() { + + } + }); + } + + /** + * 政治面貌 - 4 + */ + private void onShowPolitical() { + hideSoftKeyboard(); + if (mPoliticalList != null && mPoliticalList.size() > 0) { + if (mPoliticalPicker == null) { + mPoliticalPicker = new OptionsPickerBuilder(mActivity, (o1, o2, o3, v) -> { + DicBean bean = mPoliticalList.get(o1); + mSelPolitical = bean; + mTvPolitical.setText(bean.getDataName()); + }) + .setTitleText("请选择") + .setCancelColor(Color.parseColor("#1189FF")) + .setSubmitColor(Color.parseColor("#1189FF")) + .setTitleColor(Color.parseColor("#1189FF")) + .build(); + mPoliticalPicker.setPicker(mPoliticalList); + } + mPoliticalPicker.show(); + } else { + getDicListByType(DicIds.DIC_POLITICS, 4); + } + } + + /** + * 学历 5 + */ + private void onShowEdu() { + hideSoftKeyboard(); + if (mEduList != null && mEduList.size() > 0) { + if (mEduPicker == null) { + mEduPicker = new OptionsPickerBuilder(mActivity, (o1, o2, o3, v) -> { + DicBean bean = mEduList.get(o1); + mSelEdu = bean; + mTvEdu.setText(bean.getDataName()); + }) + .setTitleText("请选择") + .setCancelColor(Color.parseColor("#1189FF")) + .setSubmitColor(Color.parseColor("#1189FF")) + .setTitleColor(Color.parseColor("#1189FF")) + .build(); + mEduPicker.setPicker(mEduList); + } + mEduPicker.show(); + } else { + getDicListByType(DicIds.DIC_EDU, 5); + } + } + + /** + * 宗教信仰 6 + */ + private void onShowReligion() { + hideSoftKeyboard(); + if (mReligionList != null && mReligionList.size() > 0) { + if (mReligionPicker == null) { + mReligionPicker = new OptionsPickerBuilder(mActivity, (o1, o2, o3, v) -> { + DicBean bean = mReligionList.get(o1); + mSelReligion = bean; + mTvReligion.setText(bean.getDataName()); + }) + .setTitleText("请选择") + .setCancelColor(Color.parseColor("#1189FF")) + .setSubmitColor(Color.parseColor("#1189FF")) + .setTitleColor(Color.parseColor("#1189FF")) + .build(); + mReligionPicker.setPicker(mReligionList); + } + mReligionPicker.show(); + } else { + getDicListByType(DicIds.DIC_FAITH, 6); + } + } + + @Override + protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { + if (requestCode == 1234) { + if (resultCode == 222) { + DicBean bean = (DicBean) data.getSerializableExtra("bean"); + mSelWorkType = bean; + mTvWorkType.setText(bean.getDataName()); + } + } else if (requestCode == 15) { + if (resultCode == 222) { + //网格选择 + if (data != null) { + mSelGridBean = (AreaGridListBean.RowsBean) data.getSerializableExtra("bean"); + mTvGrid.setText(mSelGridBean.getGridName()); } - - @Override - public void onNext(@NonNull MigrantDetailBean censusRegisterDetailBean) { - setDataToView(censusRegisterDetailBean, 0); - } - - @Override - public void onError(@NonNull Throwable e) { - refreshView(STATE_LOAD_ERROR); - } - - @Override - public void onComplete() { - - } - }); + } + } + super.onActivityResult(requestCode, resultCode, data); } /** @@ -210,6 +610,93 @@ public class CensusMigrantAddActivity extends BaseActivity { */ private void setDataToView(MigrantDetailBean bean, int type) { mId = bean.getFloatingPopulationId(); + //基础信息 + if (!TextUtils.isEmpty(bean.getAreaCode())) { + mSelAreaCode = bean.getAreaCode(); + mSelAreaName = bean.getAreaNames(); + mTvArea.setText(bean.getAreaNames()); + } + if (!TextUtils.isEmpty(bean.getGridId())) { + mSelGridBean = new AreaGridListBean.RowsBean(); + mSelGridBean.setGridName(bean.getGridName()); + mSelGridBean.setGridName(bean.getGridName()); + mTvGrid.setText(bean.getGridName()); + } + mEtIdentity.setText(bean.getIdCardNumber());//身份证号码 + mEtName.setText(bean.getFullName());//姓名 + mEtOnceName.setText(bean.getNameUsedBefore());//曾用名--- + if (!TextUtils.isEmpty(bean.getGender())) { + mSelGender = new DicBean(); + mSelGender.setDataId(bean.getGender()); + mSelGender.setDataName(bean.getGenderDictionaryName()); + mTvGender.setText(bean.getGenderDictionaryName()); + } else { + mSelGender = null; + mTvGender.setText(""); + } + mTvBirth.setText(bean.getBirthDate());//生日 + if (!TextUtils.isEmpty(bean.getNation())) { + mTvNation.setText(bean.getNationDictionaryName());//民族 + mSelNation = new DicBean(); + mSelNation.setDataId(bean.getNation()); + mSelNation.setDataName(bean.getNationDictionaryName()); + } else { + mTvNation.setText(""); + mSelNation = null; + } + + if (!TextUtils.isEmpty(bean.getMaritalStatus())) { + mTvMarry.setText(bean.getMaritalStatusDictionaryName());//婚姻 + mSelMarry = new DicBean(); + mSelMarry.setDataId(bean.getMaritalStatus()); + mSelMarry.setDataName(bean.getMaritalStatusDictionaryName()); + } else { + mTvMarry.setText(""); + mSelMarry = null; + } + if (!TextUtils.isEmpty(bean.getPoliticalStatus())) { + mTvPolitical.setText(bean.getPoliticalStatusDictionaryName());//政治面貌 + mSelPolitical = new DicBean(); + mSelPolitical.setDataId(bean.getPoliticalStatus()); + mSelPolitical.setDataName(bean.getPoliticalStatusDictionaryName()); + } else { + mTvPolitical.setText(""); + mSelPolitical = null; + } + if (!TextUtils.isEmpty(bean.getEducation())) { + mTvEdu.setText(bean.getEducationDictionaryName());//学历 + mSelEdu = new DicBean(); + mSelEdu.setDataId(bean.getEducation()); + mSelEdu.setDataName(bean.getEducationDictionaryName()); + } else { + mSelEdu = null; + mTvEdu.setText(""); + } + if (!TextUtils.isEmpty(bean.getReligion())) { + mTvReligion.setText(bean.getReligionDictionaryName());//宗教 + mSelReligion = new DicBean(); + mSelReligion.setDataName(bean.getReligionDictionaryName()); + mSelReligion.setDataId(bean.getReligion()); + } else { + mTvReligion.setText(""); + mSelReligion = null; + } + + if (!TextUtils.isEmpty(bean.getOccupationCategory())) { + mSelWorkType = new DicBean(); + mTvWorkType.setText(bean.getOccupationCategoryDictionaryName());//职业类别 + mSelWorkType.setDataId(bean.getOccupationCategory()); + mSelWorkType.setDataName(bean.getOccupationCategoryDictionaryName()); + } else { + mSelWorkType = null; + mTvWorkType.setText(""); + } + mTvWork.setText(bean.getOccupation());//职业 + mEtWorkSpace.setText(bean.getServiceSpace());//服务处所----- + mEtPhone.setText(bean.getTelephone());//联系方式 + mEtCensusDetail.setText(bean.getNativePlaceAddr());//户籍地详址 + mEtCurDetail.setText(bean.getCurrentResidenceAddr());//现在详细地址 + //流动信息 mTvCause.setText(bean.getInflowReasonDict());//流入原因-- mSelCause = bean.getInflowReason(); mTvCardType.setText(bean.getRegistrationTypeDict());//证件类型 @@ -221,10 +708,6 @@ public class CensusMigrantAddActivity extends BaseActivity { mSelHouseType = bean.getResidenceType(); mIsAttention = bean.getKeyOfFollow().equals("1"); mSwAttention.setChecked(bean.getKeyOfFollow().equals("1"));//是否重点关注 - if (type == 0) { - mEtSearchIdCard.setText(bean.getIdCardNumber()); - doSearchPerson(); - } refreshView(STATE_LOAD_SUCCESS); } @@ -240,16 +723,16 @@ public class CensusMigrantAddActivity extends BaseActivity { mTvCause.setText(bean.getDataName()); mSelCause = bean.getDataId(); }) - .setTitleText("请选择") - .setCancelColor(Color.parseColor("#1189FF")) - .setSubmitColor(Color.parseColor("#1189FF")) - .setTitleColor(Color.parseColor("#1189FF")) - .build(); + .setTitleText("请选择") + .setCancelColor(Color.parseColor("#1189FF")) + .setSubmitColor(Color.parseColor("#1189FF")) + .setTitleColor(Color.parseColor("#1189FF")) + .build(); mFlowTypePicker.setPicker(mFlowTypeList); } mFlowTypePicker.show(); } else { - getDicListByType(DicIds.DIC_MIGRANT_TYPE, 3); + getDicListByType(DicIds.DIC_MIGRANT_TYPE, 9); } } @@ -265,16 +748,16 @@ public class CensusMigrantAddActivity extends BaseActivity { mTvHouseType.setText(bean.getDataName()); mSelHouseType = bean.getDataId(); }) - .setTitleText("请选择") - .setCancelColor(Color.parseColor("#1189FF")) - .setSubmitColor(Color.parseColor("#1189FF")) - .setTitleColor(Color.parseColor("#1189FF")) - .build(); + .setTitleText("请选择") + .setCancelColor(Color.parseColor("#1189FF")) + .setSubmitColor(Color.parseColor("#1189FF")) + .setTitleColor(Color.parseColor("#1189FF")) + .build(); mHouseTypePicker.setPicker(mHouseTypeList); } mHouseTypePicker.show(); } else { - getDicListByType(DicIds.DIC_HOUSE_TYPE, 1); + getDicListByType(DicIds.DIC_HOUSE_TYPE, 8); } } @@ -290,16 +773,16 @@ public class CensusMigrantAddActivity extends BaseActivity { mTvCardType.setText(bean.getDataName()); mSelCardType = bean.getDataId(); }) - .setTitleText("请选择") - .setCancelColor(Color.parseColor("#1189FF")) - .setSubmitColor(Color.parseColor("#1189FF")) - .setTitleColor(Color.parseColor("#1189FF")) - .build(); + .setTitleText("请选择") + .setCancelColor(Color.parseColor("#1189FF")) + .setSubmitColor(Color.parseColor("#1189FF")) + .setTitleColor(Color.parseColor("#1189FF")) + .build(); mCardTypePicker.setPicker(mCardTypeList); } mCardTypePicker.show(); } else { - getDicListByType(DicIds.DIC_CARD_TYPE, 2); + getDicListByType(DicIds.DIC_CARD_TYPE, 7); } } @@ -314,7 +797,6 @@ public class CensusMigrantAddActivity extends BaseActivity { } else { doAdd(); } - } } @@ -323,34 +805,34 @@ public class CensusMigrantAddActivity extends BaseActivity { dialog.show(); RequestBody body = buildParams(); RetrofitManager.getInstance() - .create(GridApis.class) - .doSaveFloating(body, UserLgUtils.getToken()) - .subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()) - .subscribe(new Observer() { - @Override - public void onSubscribe(@NonNull Disposable d) { + .create(GridApis.class) + .doSaveFloating(body, UserLgUtils.getToken()) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(new Observer() { + @Override + public void onSubscribe(@NonNull Disposable d) { - } + } - @Override - public void onNext(@NonNull SuccessBean successBean) { - dialog.dismiss(); - ToastUtils.show("保存成功."); - finish(); - } + @Override + public void onNext(@NonNull SuccessBean successBean) { + dialog.dismiss(); + ToastUtils.show("保存成功."); + finish(); + } - @Override - public void onError(@NonNull Throwable e) { - dialog.dismiss(); - ExceptionHandler.handleException(e); - } + @Override + public void onError(@NonNull Throwable e) { + dialog.dismiss(); + ExceptionHandler.handleException(e); + } - @Override - public void onComplete() { + @Override + public void onComplete() { - } - }); + } + }); } private void doEdit() { @@ -358,34 +840,34 @@ public class CensusMigrantAddActivity extends BaseActivity { dialog.show(); RequestBody body = buildParams(); RetrofitManager.getInstance() - .create(GridApis.class) - .doEditFloating(mId, body, UserLgUtils.getToken()) - .subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()) - .subscribe(new Observer() { - @Override - public void onSubscribe(@NonNull Disposable d) { + .create(GridApis.class) + .doEditFloating(mId, body, UserLgUtils.getToken()) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(new Observer() { + @Override + public void onSubscribe(@NonNull Disposable d) { - } + } - @Override - public void onNext(@NonNull SuccessBean successBean) { - dialog.dismiss(); - ToastUtils.show("修改成功"); - finish(); - } + @Override + public void onNext(@NonNull SuccessBean successBean) { + dialog.dismiss(); + ToastUtils.show("修改成功"); + finish(); + } - @Override - public void onError(@NonNull Throwable e) { - dialog.dismiss(); - ExceptionHandler.handleException(e); - } + @Override + public void onError(@NonNull Throwable e) { + dialog.dismiss(); + ExceptionHandler.handleException(e); + } - @Override - public void onComplete() { + @Override + public void onComplete() { - } - }); + } + }); } /** @@ -393,14 +875,51 @@ public class CensusMigrantAddActivity extends BaseActivity { */ private RequestBody buildParams() { SaveFloatingBean bean = new SaveFloatingBean(); - bean.setAreaCode(mBaseInfoBean.getAreaCode()); - bean.setAreaNames(mBaseInfoBean.getAreaNames()); - bean.setGridId(mBaseInfoBean.getGridId()); - bean.setGridName(mBaseInfoBean.getGridName()); - bean.setFullName(mBaseInfoBean.getFullName()); - bean.setIdCardNumber(mBaseInfoBean.getIdCardNumber()); - + bean.setFullName(mEtName.getText().toString().trim()); + bean.setIdCardNumber(mEtIdentity.getText().toString().trim()); bean.setInflowReason(mSelCause); + bean.setAreaNames(mSelAreaName); + bean.setAreaCode(mSelAreaCode); + bean.setGridName(mSelGridBean.getGridName()); + bean.setGridId(mSelGridBean.getGridId()); + String idCard = mEtIdentity.getText().toString().trim(); + bean.setIdCardNumber(idCard); + String name = mEtName.getText().toString().trim(); + bean.setFullName(name); + String onceName = mEtOnceName.getText().toString().trim(); + if (!TextUtils.isEmpty(onceName)) { + bean.setNameUsedBefore(onceName); + } + String gender = mTvGender.getText().toString().trim(); + bean.setGender(mSelGender.getDataId()); + String birth = mTvBirth.getText().toString().trim(); + bean.setBirthDate(birth); + String nation = mTvNation.getText().toString().trim(); + bean.setNation(mSelNation.getDataId()); + String marry = mTvMarry.getText().toString().trim(); + bean.setMaritalStatus(mSelMarry.getDataId()); + String political = mTvPolitical.getText().toString().trim(); + bean.setPoliticalStatus(mSelPolitical.getDataId()); + String edu = mTvEdu.getText().toString().trim(); + bean.setEducation(mSelEdu.getDataId()); + String religion = mTvReligion.getText().toString().trim(); + if (!TextUtils.isEmpty(religion)) { + bean.setReligion(mSelReligion.getDataId()); + } + String workType = mTvWorkType.getText().toString().trim(); + bean.setOccupationCategory(mSelWorkType.getDataId()); + String work = mTvWork.getText().toString().trim(); + bean.setOccupation(work); + String workSpace = mEtWorkSpace.getText().toString().trim(); + if (!TextUtils.isEmpty(workSpace)) { + bean.setServiceSpace(workSpace); + } + String phone = mEtPhone.getText().toString().trim(); + bean.setTelephone(phone); + String censusDetail = mEtCensusDetail.getText().toString().trim(); + bean.setNativePlaceAddr(censusDetail); + String curDetail = mEtCurDetail.getText().toString().trim(); + bean.setCurrentResidenceAddr(curDetail); if (!TextUtils.isEmpty(mSelCardType)) { bean.setRegistrationType(mSelCardType); } @@ -430,6 +949,74 @@ public class CensusMigrantAddActivity extends BaseActivity { * 校验参数 */ private boolean doCheckParams() { + if (TextUtils.isEmpty(mSelAreaCode)) { + ToastUtils.show("请选择所在地区"); + return false; + } + if (mSelGridBean == null) { + ToastUtils.show("请选择所在网格"); + return false; + } + String idCard = mEtIdentity.getText().toString().trim(); + if (TextUtils.isEmpty(idCard) || !RegexUtils.isIDNumber(idCard)) { + ToastUtils.show("请输入正确的身份证号码"); + return false; + } + String name = mEtName.getText().toString().trim(); + if (TextUtils.isEmpty(name)) { + ToastUtils.show("请输入姓名"); + return false; + } + String gender = mTvGender.getText().toString().trim(); + if (TextUtils.isEmpty(gender)) { + ToastUtils.show("请选择性别"); + return false; + } + String birth = mTvBirth.getText().toString().trim(); + if (TextUtils.isEmpty(birth)) { + ToastUtils.show("请选择出生日期"); + return false; + } + String nation = mTvNation.getText().toString().trim(); + if (TextUtils.isEmpty(nation)) { + ToastUtils.show("请选择民族"); + return false; + } + String marry = mTvMarry.getText().toString().trim(); + if (TextUtils.isEmpty(marry)) { + ToastUtils.show("请选择婚姻状况"); + return false; + } + String political = mTvPolitical.getText().toString().trim(); + if (TextUtils.isEmpty(political)) { + ToastUtils.show("请选择政治面貌"); + return false; + } + String edu = mTvEdu.getText().toString().trim(); + if (TextUtils.isEmpty(edu)) { + ToastUtils.show("请选择学历"); + return false; + } + String workType = mTvWorkType.getText().toString().trim(); + if (TextUtils.isEmpty(workType)) { + ToastUtils.show("请选择职业类别"); + return false; + } + String phone = mEtPhone.getText().toString().trim(); + if (TextUtils.isEmpty(phone) || !RegexUtils.isTel(phone)) { + ToastUtils.show("请输入合法的联系方式"); + return false; + } + String censusDetail = mEtCensusDetail.getText().toString().trim(); + if (TextUtils.isEmpty(censusDetail)) { + ToastUtils.show("请输入籍贯地址"); + return false; + } + String curDetail = mEtCurDetail.getText().toString().trim(); + if (TextUtils.isEmpty(curDetail)) { + ToastUtils.show("请输入现住址"); + return false; + } String cause = mTvCause.getText().toString().trim(); if (TextUtils.isEmpty(cause)) { ToastUtils.show("请选择流入原因"); @@ -458,12 +1045,12 @@ public class CensusMigrantAddActivity extends BaseActivity { mStartPicker = new TimePickerBuilder(mActivity, (date, v) -> { mTvStartDate.setText(mDateFormat.format(date)); }) - .setTitleText("请选择日期") - .setCancelColor(Color.parseColor("#1189FF")) - .setSubmitColor(Color.parseColor("#1189FF")) - .setType(new boolean[]{true, true, true, false, false, false}) - .setTitleColor(Color.parseColor("#1189FF")) - .build(); + .setTitleText("请选择日期") + .setCancelColor(Color.parseColor("#1189FF")) + .setSubmitColor(Color.parseColor("#1189FF")) + .setType(new boolean[]{true, true, true, false, false, false}) + .setTitleColor(Color.parseColor("#1189FF")) + .build(); } mStartPicker.show(); } @@ -480,12 +1067,12 @@ public class CensusMigrantAddActivity extends BaseActivity { ToastUtils.show("到期日期必须大于登记日期"); } }) - .setTitleText("请选择日期") - .setCancelColor(Color.parseColor("#1189FF")) - .setSubmitColor(Color.parseColor("#1189FF")) - .setType(new boolean[]{true, true, true, false, false, false}) - .setTitleColor(Color.parseColor("#1189FF")) - .build(); + .setTitleText("请选择日期") + .setCancelColor(Color.parseColor("#1189FF")) + .setSubmitColor(Color.parseColor("#1189FF")) + .setType(new boolean[]{true, true, true, false, false, false}) + .setTitleColor(Color.parseColor("#1189FF")) + .build(); } mEndPicker.show(); } @@ -511,90 +1098,62 @@ public class CensusMigrantAddActivity extends BaseActivity { ProgressDialog dialog = UIUtil.initDialog(mActivity, "获取中..."); dialog.show(); RetrofitManager.getInstance() - .create(GridApis.class) - .getDictListAllByPid(pId, UserLgUtils.getToken()) - .subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()) - .subscribe(new Observer>() { - @Override - public void onSubscribe(@NonNull Disposable d) { - - } - - @Override - public void onNext(@NonNull List typeListBeans) { - dialog.dismiss(); - if (typeListBeans.size() > 0) { - switch (i) { - case 2://办证类型 - mCardTypeList = typeListBeans; - onShowCardType(); - break; - case 1://住所类型 - mHouseTypeList = typeListBeans; - onShowHouseType(); - break; - case 3://流入原因 - mFlowTypeList = typeListBeans; - onShowCauseType(); - break; - } - } else { - ToastUtils.show("暂无数据"); - } - } - - @Override - public void onError(@NonNull Throwable e) { - dialog.dismiss(); - ExceptionHandler.handleException(e); - } - - @Override - public void onComplete() { - - } - }); - - } - - /** - * 搜索人员基础信息 - */ - private void doSearchPerson() { - String searchIdCard = mEtSearchIdCard.getText().toString().trim(); - if (TextUtils.isEmpty(searchIdCard) || !RegexUtils.isIDNumber(searchIdCard)) { - ToastUtils.show("请输入合法的身份证号码"); - return; - } else { - hideSoftKeyboard(); - ProgressDialog dialog = UIUtil.initDialog(mActivity, "查询中..."); - dialog.show(); - RetrofitManager.getInstance() - .create(BaseApiService.class) - .doSearchPerson(searchIdCard, UserLgUtils.getToken()) + .create(GridApis.class) + .getDictListAllByPid(pId, UserLgUtils.getToken()) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) - .subscribe(new Observer() { + .subscribe(new Observer>() { @Override public void onSubscribe(@NonNull Disposable d) { } @Override - public void onNext(@NonNull PersonSearchBean infoBean1) { + public void onNext(@NonNull List typeListBeans) { dialog.dismiss(); - if (!TextUtils.isEmpty(infoBean1.getIdCardNumber())) { - //设置基础信息 - setBaseInfo(infoBean1); + if (typeListBeans.size() > 0) { + + switch (i) { + case 1://性别 + mGenderList = typeListBeans; + onShowGender(); + break; + case 2://名族 + mNationList = typeListBeans; + onShowNation(); + break; + case 3://婚姻状况 + mMarryList = typeListBeans; + onShowMarry(); + break; + case 4://政治面貌 + mPoliticalList = typeListBeans; + onShowPolitical(); + break; + case 5://学历 + mEduList = typeListBeans; + onShowEdu(); + break; + case 6://宗教信仰 + mReligionList = typeListBeans; + onShowReligion(); + break; + case 7://办证类型 + mCardTypeList = typeListBeans; + onShowCardType(); + break; + case 8://住所类型 + mHouseTypeList = typeListBeans; + onShowHouseType(); + break; + case 9://流入原因 + mFlowTypeList = typeListBeans; + onShowCauseType(); + break; + } + } else { - ToastUtils.show("未查询到该人员的基础信息,请完善基础信息"); - mTvBaseName.setText(""); - mTvBaseGender.setText(""); - mTvBasePhone.setText(""); - mTvBaseNative.setText(""); - mTvBaseCurLoc.setText(""); - mLlContent.setVisibility(View.GONE); + ToastUtils.show("暂无数据"); } } @@ -609,26 +1168,208 @@ public class CensusMigrantAddActivity extends BaseActivity { } }); + + } + + /** + * 搜索人员基础信息 + */ + private void doSearchPerson() { + //搜索人员 + + String searchIdCard = mEtSearchIdCard.getText().toString().trim(); + if (TextUtils.isEmpty(searchIdCard) || !RegexUtils.isIDNumber(searchIdCard)) { + ToastUtils.show("请输入合法的身份证号码"); + } else { + hideSoftKeyboard(); + ProgressDialog dialog = UIUtil.initDialog(mActivity, "查询中..."); + dialog.show(); + RetrofitManager.getInstance() + .create(BaseApiService.class) + .doSearchFLowPerson(searchIdCard, UserLgUtils.getToken()) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(new Observer() { + @Override + public void onSubscribe(@NonNull Disposable d) { + + } + + @Override + public void onNext(@NonNull PersonFlowSearchBean infoBean1) { + dialog.dismiss(); + if (!TextUtils.isEmpty(infoBean1.getIdCardNumber())) { + //设置基础信息 + setPersonInfo(infoBean1); + } else { + Toaster.showLong("未查询到该人员的基础信息,请完善基础信息"); + //重置所有信息 + mEtIdentity.setText(searchIdCard); + mId = ""; + //基础信息 + mEtName.setText("");//姓名 + mEtOnceName.setText("");//曾用名--- + mSelGender = null; + mTvGender.setText(""); +// mTvBirth.setText(bean.getBirthDate());//生日 + mTvNation.setText(""); + mSelNation = null; + mTvMarry.setText(""); + mSelMarry = null; + mTvPolitical.setText(""); + mSelPolitical = null; + mSelEdu = null; + mTvEdu.setText(""); + mTvReligion.setText(""); + mSelReligion = null; + mSelWorkType = null; + mTvWorkType.setText(""); + mTvWork.setText("");//职业 + mEtWorkSpace.setText("");//服务处所----- + mEtPhone.setText("");//联系方式 + mEtCensusDetail.setText("");//户籍地详址 + mEtCurDetail.setText("");//现在详细地址 + //流动信息 + mTvCause.setText("");//流入原因-- + mSelCause = ""; + mTvCardType.setText("");//证件类型 + mEtCardNumber.setText("");//证件号码 + mTvStartDate.setText("");//开始日期 + mTvEndDate.setText("");//到期日期 + mTvHouseType.setText("");//住所类型 + mSelCardType = ""; + mSelHouseType = ""; + mIsAttention = false; + mSwAttention.setChecked(false);//是否重点关注 + } + } + + @Override + public void onError(@NonNull Throwable e) { + dialog.dismiss(); + ExceptionHandler.handleException(e); + } + + @Override + public void onComplete() { + + } + }); } } - private PersonSearchBean mBaseInfoBean; - /** - * 设置基础信息 + * 回显数据 */ - private void setBaseInfo(PersonSearchBean o) { - mBaseInfoBean = o; - mLlContent.setVisibility(View.VISIBLE); - mTvBaseArea.setText(o.getAreaNames()); - mTvBaseGrid.setText(o.getGridName()); - mTvBaseName.setText(o.getFullName()); - mTvBaseGender.setText(o.getGenderDictionaryName()); - mTvBasePhone.setText(o.getTelephone()); - mTvBaseNative.setText(o.getNativePlaceAddr()); - mTvBaseCurLoc.setText(o.getCurrentResidenceAddr()); + private void setPersonInfo(PersonFlowSearchBean bean) { + mId = bean.getFloatingPopulationId(); + //基础信息 + if (!TextUtils.isEmpty(bean.getAreaCode())) { + mSelAreaCode = bean.getAreaCode(); + mSelAreaName = bean.getAreaNames(); + mTvArea.setText(bean.getAreaNames()); + } + if (!TextUtils.isEmpty(bean.getGridId())) { + mSelGridBean = new AreaGridListBean.RowsBean(); + mSelGridBean.setGridName(bean.getGridName()); + mSelGridBean.setGridName(bean.getGridName()); + mTvGrid.setText(bean.getGridName()); + } + mEtIdentity.setText(bean.getIdCardNumber());//身份证号码 + mEtName.setText(bean.getFullName());//姓名 + mEtOnceName.setText(bean.getNameUsedBefore());//曾用名--- + if (!TextUtils.isEmpty(bean.getGridId())) { + mSelGridBean = new AreaGridListBean.RowsBean(); + mSelGridBean.setGridId(bean.getGridId()); + mSelGridBean.setGridName(bean.getGridName()); + mTvGrid.setText(bean.getGridName()); + } + if (!TextUtils.isEmpty(bean.getGender())) { + mSelGender = new DicBean(); + mSelGender.setDataId(bean.getGender()); + mSelGender.setDataName(bean.getGenderDictionaryName()); + mTvGender.setText(bean.getGenderDictionaryName()); + } else { + mSelGender = null; + mTvGender.setText(""); + } + mTvBirth.setText(bean.getBirthDate());//生日 + if (!TextUtils.isEmpty(bean.getNation())) { + mTvNation.setText(bean.getNationDictionaryName());//民族 + mSelNation = new DicBean(); + mSelNation.setDataId(bean.getNation()); + mSelNation.setDataName(bean.getNationDictionaryName()); + } else { + mSelNation = null; + mTvNation.setText(""); + } + + if (!TextUtils.isEmpty(bean.getMaritalStatus())) { + mTvMarry.setText(bean.getMaritalStatusDictionaryName());//婚姻 + mSelMarry = new DicBean(); + mSelMarry.setDataId(bean.getMaritalStatus()); + mSelMarry.setDataName(bean.getMaritalStatusDictionaryName()); + } else { + mSelMarry = null; + mTvMarry.setText(""); + } + if (!TextUtils.isEmpty(bean.getPoliticalStatus())) { + mTvPolitical.setText(bean.getPoliticalStatusDictionaryName());//政治面貌 + mSelPolitical = new DicBean(); + mSelPolitical.setDataId(bean.getPoliticalStatus()); + mSelPolitical.setDataName(bean.getPoliticalStatusDictionaryName()); + } else { + mTvPolitical.setText(""); + mSelPolitical = null; + } + if (!TextUtils.isEmpty(bean.getEducation())) { + mTvEdu.setText(bean.getEducationDictionaryName());//学历 + mSelEdu = new DicBean(); + mSelEdu.setDataId(bean.getEducation()); + mSelEdu.setDataName(bean.getEducationDictionaryName()); + } else { + mTvEdu.setText(""); + mSelEdu = null; + } + if (!TextUtils.isEmpty(bean.getReligion())) { + mTvReligion.setText(bean.getReligionDictionaryName());//宗教 + mSelReligion = new DicBean(); + mSelReligion.setDataName(bean.getReligionDictionaryName()); + mSelReligion.setDataId(bean.getReligion()); + } else { + mTvReligion.setText(""); + mSelReligion = null; + } + + if (!TextUtils.isEmpty(bean.getOccupationCategory())) { + mSelWorkType = new DicBean(); + mTvWorkType.setText(bean.getOccupationCategoryDictionaryName());//职业类别 + mSelWorkType.setDataId(bean.getOccupationCategory()); + mSelWorkType.setDataName(bean.getOccupationCategoryDictionaryName()); + } else { + mSelWorkType = null; + mTvWorkType.setText(""); + } + mTvWork.setText(bean.getOccupation());//职业 + mEtWorkSpace.setText(bean.getServiceSpace());//服务处所----- + mEtPhone.setText(bean.getTelephone());//联系方式 + mEtCensusDetail.setText(bean.getNativePlaceAddr());//户籍地详址 + mEtCurDetail.setText(bean.getCurrentResidenceAddr());//现在详细地址 + //流动信息 + mSelCause = bean.getInflowReason(); + mTvCause.setText(bean.getInflowReasonDict());//流入原因-- + mTvCardType.setText(bean.getRegistrationTypeDict());//证件类型 + mEtCardNumber.setText(bean.getCardNumber());//证件号码 + mTvStartDate.setText(bean.getRegisterDate());//开始日期 + mTvEndDate.setText(bean.getCardExpireDate());//到期日期 + mTvHouseType.setText(bean.getResidenceTypeDict());//住所类型 + mSelCardType = bean.getRegistrationType(); + mSelHouseType = bean.getResidenceType(); + mIsAttention = bean.getKeyOfFollow().equals("1"); + mSwAttention.setChecked(bean.getKeyOfFollow().equals("1"));//是否重点关注 } + @Override protected void onDestroy() { super.onDestroy(); diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/normal/CensusMigrantDetailActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/normal/CensusMigrantDetailActivity.java index a057ef4..986e83d 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/normal/CensusMigrantDetailActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/normal/CensusMigrantDetailActivity.java @@ -1,5 +1,6 @@ package com.tengshisoft.gridmodule.incident.activitys.populace.normal; +import android.text.TextUtils; import android.widget.Switch; import android.widget.TextView; @@ -9,11 +10,11 @@ import com.tengshisoft.commonmodule.nets.GridApis; import com.tengshisoft.gridmodule.R; import com.tengshisoft.gridmodule.R2; import com.tenlionsoft.baselib.constant.PathConfig; -import com.tenlionsoft.baselib.core.beans.PersonSearchBean; import com.tenlionsoft.baselib.core.retrofit_net.RetrofitManager; -import com.tenlionsoft.baselib.core.retrofit_net.api.BaseApiService; import com.tenlionsoft.baselib.core.widget.base.BaseActivity; import com.tenlionsoft.baselib.utils.ExceptionHandler; +import com.tenlionsoft.baselib.utils.IDCard; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tenlionsoft.baselib.utils.UserLgUtils; import butterknife.BindView; @@ -21,7 +22,6 @@ import butterknife.ButterKnife; import butterknife.Unbinder; import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers; import io.reactivex.rxjava3.annotations.NonNull; -import io.reactivex.rxjava3.core.Observable; import io.reactivex.rxjava3.core.Observer; import io.reactivex.rxjava3.disposables.Disposable; import io.reactivex.rxjava3.schedulers.Schedulers; @@ -32,22 +32,43 @@ import io.reactivex.rxjava3.schedulers.Schedulers; @Route(path = PathConfig.PATH_MODULE_GRID_ACTIVITY_POPULACE_MIGRANT_DETAIL) public class CensusMigrantDetailActivity extends BaseActivity { //基础信息 - @BindView(R2.id.tv_base_name) - TextView mTvBaseName;//姓名 - @BindView(R2.id.tv_base_former_name) - TextView mTvBaseFormerName;//曾用名 - @BindView(R2.id.tv_base_gender) - TextView mTvBaseGender;//性别 - @BindView(R2.id.tv_base_id_card) - TextView mTvBaseIdCard;//身份证 - @BindView(R2.id.tv_base_phone) - TextView mTvBasePhone;//联系电话 - @BindView(R2.id.tv_base_nation) - TextView mTvBaseNation;//名族 - @BindView(R2.id.tv_base_register_loc) - TextView mTvBaseRegisterLoc;//户籍地 - @BindView(R2.id.tv_base_cur_address) - TextView mTvBaseCurAddress;//现住址详情 + @BindView(R2.id.et_identity) + TextView mEtIdentity;//身份证号 + @BindView(R2.id.et_name) + TextView mEtName;//姓名 + @BindView(R2.id.et_once_name) + TextView mEtOnceName;//曾用名--- + @BindView(R2.id.tv_gender) + TextView mTvGender;//性别 + @BindView(R2.id.tv_birth) + TextView mTvBirth;//生日 + @BindView(R2.id.tv_nation) + TextView mTvNation;//民族 + @BindView(R2.id.tv_marry) + TextView mTvMarry;//婚姻 + @BindView(R2.id.tv_political) + TextView mTvPolitical;//政治面貌 + @BindView(R2.id.tv_edu) + TextView mTvEdu;//学历 + @BindView(R2.id.tv_religion) + TextView mTvReligion;//宗教 + @BindView(R2.id.tv_work_type) + TextView mTvWorkType;//职业类别 + @BindView(R2.id.et_work) + TextView mTvWork;//职业 + @BindView(R2.id.et_work_space) + TextView mEtWorkSpace;//服务处所----- + @BindView(R2.id.et_phone) + TextView mEtPhone;//联系方式 + @BindView(R2.id.et_census_detail) + TextView mEtCensusDetail;//户籍地详址 + @BindView(R2.id.et_cur_detail) + TextView mEtCurDetail;//现在详细地址 + @BindView(R2.id.tv_area) + TextView mTvArea; + @BindView(R2.id.tv_grid) + TextView mTvGrid; + //流动信息 @BindView(R2.id.tv_cause) @@ -64,13 +85,8 @@ public class CensusMigrantDetailActivity extends BaseActivity { TextView mTvHouseType;//住所类型 @BindView(R2.id.sw_attention) Switch mSwAttention;//是否重点关注 - @BindView(R2.id.tv_base_area) - TextView mTvBaseArea; - @BindView(R2.id.tv_base_grid) - TextView mTvBaseGrid; private Unbinder mBind; - private PersonSearchBean mBaseInfo; private MigrantDetailBean mInfoBean; @Override @@ -100,54 +116,71 @@ public class CensusMigrantDetailActivity extends BaseActivity { refreshView(STATE_LOAD_LOADING); String id = getIntent().getStringExtra("id"); String idCard = getIntent().getStringExtra("idCard"); - getDetailData(id, idCard); + if (!TextUtils.isEmpty(id)) { + getDetailData(id); + } else { + ToastUtils.show("数据有误"); + } } /** * 获取详细信息 * * @param id - * @param idCard */ - private void getDetailData(String id, String idCard) { - Observable baseInfo = RetrofitManager.getInstance().create(BaseApiService.class).doSearchPerson(idCard, UserLgUtils.getToken()); - Observable registerInfo = RetrofitManager.getInstance().create(GridApis.class).getCensusNmigrantDetail(id, UserLgUtils.getToken()); - Observable.mergeDelayError(baseInfo, registerInfo) - .subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()) - .subscribe(new Observer() { - @Override - public void onSubscribe(@NonNull Disposable d) { + private void getDetailData(String id) { + RetrofitManager.getInstance().create(GridApis.class) + .getCensusNmigrantDetail(id, UserLgUtils.getToken()) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(new Observer() { + @Override + public void onSubscribe(@NonNull Disposable d) { - } + } - @Override - public void onNext(@NonNull Object o) { - if (o instanceof PersonSearchBean) { - mBaseInfo = (PersonSearchBean) o; - setBaseInfo(); - } else if (o instanceof MigrantDetailBean) { - mInfoBean = (MigrantDetailBean) o; + @Override + public void onNext(@NonNull MigrantDetailBean migrantDetailBean) { + mInfoBean = migrantDetailBean; setInfo(); } - refreshView(STATE_LOAD_SUCCESS); - } - @Override - public void onError(@NonNull Throwable e) { - ExceptionHandler.handleException(e); - refreshView(STATE_LOAD_ERROR); - } + @Override + public void onError(@NonNull Throwable e) { + refreshView(STATE_LOAD_ERROR); + ExceptionHandler.handleException(e); + } - @Override - public void onComplete() { + @Override + public void onComplete() { - } - }); + } + }); } private void setInfo() { + refreshView(STATE_LOAD_SUCCESS); + //基础信息 + mEtIdentity.setText(IDCard.idMask(mInfoBean.getIdCardNumber(), 10, 4));//身份证号码 + mEtName.setText(mInfoBean.getFullName());//姓名 + mEtOnceName.setText(mInfoBean.getNameUsedBefore());//曾用名--- + mTvGender.setText(mInfoBean.getGenderDictionaryName());//性别 + mTvArea.setText(mInfoBean.getAreaNames()); + mTvGrid.setText(mInfoBean.getGridName()); + mTvBirth.setText(mInfoBean.getBirthDate());//生日 + mTvNation.setText(mInfoBean.getNationDictionaryName());//民族 + mTvMarry.setText(mInfoBean.getMaritalStatusDictionaryName());//婚姻 + mTvPolitical.setText(mInfoBean.getPoliticalStatusDictionaryName());//政治面貌 + mTvEdu.setText(mInfoBean.getEducationDictionaryName());//学历 + mTvReligion.setText(mInfoBean.getReligionDictionaryName());//宗教 + mTvWorkType.setText(mInfoBean.getOccupationCategoryDictionaryName());//职业类别 + mTvWork.setText(mInfoBean.getOccupation());//职业 + mEtWorkSpace.setText(mInfoBean.getServiceSpace());//服务处所----- + mEtPhone.setText(mInfoBean.getTelephone());//联系方式 + mEtCensusDetail.setText(mInfoBean.getNativePlaceAddr());//户籍地详址 + mEtCurDetail.setText(mInfoBean.getCurrentResidenceAddr());//现在详细地址 + //流动信息 mTvCause.setText(mInfoBean.getInflowReasonDict());//流入原因-- mTvCardType.setText(mInfoBean.getRegistrationTypeDict());//证件类型 mEtCardNumber.setText(mInfoBean.getCardNumber());//证件号码 @@ -157,20 +190,5 @@ public class CensusMigrantDetailActivity extends BaseActivity { mSwAttention.setChecked(!mInfoBean.getKeyOfFollow().equals("0"));//是否重点关注 } - /** - * 基础信息 - */ - private void setBaseInfo() { - mTvBaseArea.setText(mBaseInfo.getAreaNames()); - mTvBaseGrid.setText(mBaseInfo.getGridName()); - mTvBaseName.setText(mBaseInfo.getFullName()); - mTvBaseFormerName.setText(mBaseInfo.getNameUsedBefore()); - mTvBaseGender.setText(mBaseInfo.getGenderDictionaryName()); - mTvBaseIdCard.setText(mBaseInfo.getIdCardNumber());//身份证 - mTvBasePhone.setText(mBaseInfo.getTelephone());//联系电话 - mTvBaseNation.setText(mBaseInfo.getNationDictionaryName());//名族 - mTvBaseRegisterLoc.setText(mBaseInfo.getNativePlaceAddr());//户籍地 - mTvBaseCurAddress.setText(mBaseInfo.getCurrentResidenceAddr());//现住址详情 - } } \ No newline at end of file diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/normal/CensusMigrantListActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/normal/CensusMigrantListActivity.java index 115fb19..a17b9a7 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/normal/CensusMigrantListActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/normal/CensusMigrantListActivity.java @@ -5,14 +5,14 @@ import android.app.ProgressDialog; import android.graphics.Color; import android.text.TextUtils; import android.view.View; -import android.widget.Button; -import android.widget.EditText; -import android.widget.ImageView; 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.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.scwang.smart.refresh.layout.SmartRefreshLayout; import com.tengshisoft.commonmodule.adapters.CensusMigrantAdapter; import com.tengshisoft.commonmodule.beans.MigrantListBean; @@ -31,9 +31,6 @@ import com.tenlionsoft.baselib.utils.UserLgUtils; 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; @@ -82,19 +79,20 @@ public class CensusMigrantListActivity extends BaseActivity { @Override protected void doSearchByTitle() { + doSearch(); } @Override public void initData() { mBind = ButterKnife.bind(this); - mTvBaseTitle.setText("流动人口"); + mTvBaseTitle.setText("非户籍人口"); mTvPublish.setVisibility(View.VISIBLE); mIvAppSearchIcon.setVisibility(View.VISIBLE); mTvPublish.setText("新增"); mTvPublish.setOnClickListener(v -> ARouter.getInstance() .build(PathConfig.PATH_MODULE_GRID_ACTIVITY_POPULACE_MIGRANT_ADD) - .withString("title", "流动人口信息录入") + .withString("title", "非户籍人口信息录入") .navigation()); mAdapter = new CensusMigrantAdapter(mActivity, mDatas); @@ -130,6 +128,9 @@ public class CensusMigrantListActivity extends BaseActivity { hideSoftKeyboard(); mKeywords = searchContent; mCurPage = 1; + refreshView(STATE_LOAD_LOADING); + mDatas.clear(); + mAdapter.setData(mDatas); getUpcomingList(mCurPage); } else { ToastUtils.show("请输入要查询的内容"); @@ -194,7 +195,7 @@ public class CensusMigrantListActivity extends BaseActivity { private void doEditBean(MigrantListBean.RowsBean bean, int pos) { ARouter.getInstance() .build(PathConfig.PATH_MODULE_GRID_ACTIVITY_POPULACE_MIGRANT_ADD) - .withString("title", "流动人口新编辑") + .withString("title", "非户籍人口信息编辑") .withString("id", bean.getFloatingPopulationId()) .navigation(); } @@ -268,10 +269,9 @@ public class CensusMigrantListActivity extends BaseActivity { mSrlContent.setNoMoreData(true); refreshView(STATE_LOAD_SUCCESS); } else { - if (TextUtils.isEmpty(mKeywords)) { + refreshView(STATE_LOAD_EMPTY); + if (!TextUtils.isEmpty(mKeywords)) { //无数据 - refreshView(STATE_LOAD_EMPTY); - } else { ToastUtils.show("未查询到相关内容"); } } diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/normal/CensusRearListActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/normal/CensusRearListActivity.java index 52be9e4..1cedb04 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/normal/CensusRearListActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/normal/CensusRearListActivity.java @@ -9,7 +9,7 @@ import android.widget.TextView; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.scwang.smart.refresh.layout.SmartRefreshLayout; import com.tengshisoft.commonmodule.adapters.CensusRearAdapter; import com.tengshisoft.commonmodule.beans.RearListBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/normal/CensusRearPersonAddActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/normal/CensusRearPersonAddActivity.java index 7788d5d..4e0ccec 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/normal/CensusRearPersonAddActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/normal/CensusRearPersonAddActivity.java @@ -15,7 +15,7 @@ import com.alibaba.android.arouter.facade.annotation.Route; import com.bigkoo.pickerview.builder.OptionsPickerBuilder; import com.bigkoo.pickerview.view.OptionsPickerView; import com.google.gson.Gson; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.beans.CensusRearDetailBean; import com.tengshisoft.commonmodule.beans.SaveRearBean; import com.tengshisoft.commonmodule.beans.SuccessBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/normal/CensusRegisterAddActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/normal/CensusRegisterAddActivity.java index 045a955..f90d680 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/normal/CensusRegisterAddActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/normal/CensusRegisterAddActivity.java @@ -14,7 +14,7 @@ import com.alibaba.android.arouter.facade.annotation.Route; import com.bigkoo.pickerview.builder.OptionsPickerBuilder; import com.bigkoo.pickerview.view.OptionsPickerView; import com.google.gson.Gson; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.beans.CensusRegisterDetailBean; import com.tengshisoft.commonmodule.beans.CensusmsgBean; import com.tengshisoft.commonmodule.beans.SuccessBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/normal/CensusRegisterListActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/normal/CensusRegisterListActivity.java index bc1a180..89970eb 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/normal/CensusRegisterListActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/normal/CensusRegisterListActivity.java @@ -12,7 +12,7 @@ import android.widget.TextView; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.scwang.smart.refresh.layout.SmartRefreshLayout; import com.tengshisoft.commonmodule.adapters.CensusRegisterAdapter; import com.tengshisoft.commonmodule.beans.CensusRegisterListBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/outbound/CensusOutBoundAddActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/outbound/CensusOutBoundAddActivity.java index 7ca0e55..5f44efa 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/outbound/CensusOutBoundAddActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/outbound/CensusOutBoundAddActivity.java @@ -16,7 +16,7 @@ import com.bigkoo.pickerview.builder.TimePickerBuilder; import com.bigkoo.pickerview.view.OptionsPickerView; import com.bigkoo.pickerview.view.TimePickerView; import com.google.gson.Gson; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.beans.AreaGridListBean; import com.tengshisoft.commonmodule.beans.OutboundDetailBean; import com.tengshisoft.commonmodule.beans.SaveOutboundBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/outbound/CensusOutboundListActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/outbound/CensusOutboundListActivity.java index 6ff7360..6f311b7 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/outbound/CensusOutboundListActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/outbound/CensusOutboundListActivity.java @@ -13,7 +13,7 @@ import androidx.recyclerview.widget.RecyclerView; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.scwang.smart.refresh.layout.SmartRefreshLayout; import com.tengshisoft.commonmodule.adapters.CensusOutboundAdapter; import com.tengshisoft.commonmodule.beans.OutboundListBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/special/CensusAidsAddActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/special/CensusAidsAddActivity.java index 47585bf..c173aab 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/special/CensusAidsAddActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/special/CensusAidsAddActivity.java @@ -18,7 +18,7 @@ import com.bigkoo.pickerview.builder.TimePickerBuilder; import com.bigkoo.pickerview.view.OptionsPickerView; import com.bigkoo.pickerview.view.TimePickerView; import com.google.gson.Gson; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.beans.AidsDetailBean; import com.tengshisoft.commonmodule.beans.SaveAidsBean; import com.tengshisoft.commonmodule.beans.SuccessBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/special/CensusAidsListActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/special/CensusAidsListActivity.java index 3132a21..522023d 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/special/CensusAidsListActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/special/CensusAidsListActivity.java @@ -13,7 +13,7 @@ import android.widget.TextView; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.scwang.smart.refresh.layout.SmartRefreshLayout; import com.tengshisoft.commonmodule.adapters.CensusAidsAdapter; import com.tengshisoft.commonmodule.beans.CensusAidsListBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/special/CensusCorrctListActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/special/CensusCorrctListActivity.java index 1cd6ef4..1d962e8 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/special/CensusCorrctListActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/special/CensusCorrctListActivity.java @@ -13,7 +13,7 @@ import android.widget.TextView; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.scwang.smart.refresh.layout.SmartRefreshLayout; import com.tengshisoft.commonmodule.adapters.CensusCorrectAdapter; import com.tengshisoft.commonmodule.beans.CensusCorrectListBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/special/CensusCorrectAddActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/special/CensusCorrectAddActivity.java index 01a61c0..ac897bc 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/special/CensusCorrectAddActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/special/CensusCorrectAddActivity.java @@ -18,7 +18,7 @@ import com.bigkoo.pickerview.builder.TimePickerBuilder; import com.bigkoo.pickerview.view.OptionsPickerView; import com.bigkoo.pickerview.view.TimePickerView; import com.google.gson.Gson; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.beans.CorrectDetailBean; import com.tengshisoft.commonmodule.beans.SaveCorrectBean; import com.tengshisoft.commonmodule.beans.SuccessBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/special/CensusDrugAddActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/special/CensusDrugAddActivity.java index ed8ed0e..705ada9 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/special/CensusDrugAddActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/special/CensusDrugAddActivity.java @@ -17,7 +17,7 @@ import com.bigkoo.pickerview.builder.TimePickerBuilder; import com.bigkoo.pickerview.view.OptionsPickerView; import com.bigkoo.pickerview.view.TimePickerView; import com.google.gson.Gson; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.beans.DrugDetailBean; import com.tengshisoft.commonmodule.beans.SaveDrugBean; import com.tengshisoft.commonmodule.beans.SuccessBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/special/CensusDrugListActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/special/CensusDrugListActivity.java index 9e67e4d..eab8427 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/special/CensusDrugListActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/special/CensusDrugListActivity.java @@ -13,7 +13,7 @@ import android.widget.TextView; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.scwang.smart.refresh.layout.SmartRefreshLayout; import com.tengshisoft.commonmodule.adapters.CensusDrugAdapter; import com.tengshisoft.commonmodule.beans.CensusDrugListBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/special/CensusSpecialCriminalAddActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/special/CensusSpecialCriminalAddActivity.java index 574b870..3c33c88 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/special/CensusSpecialCriminalAddActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/special/CensusSpecialCriminalAddActivity.java @@ -17,7 +17,7 @@ import com.bigkoo.pickerview.builder.TimePickerBuilder; import com.bigkoo.pickerview.view.OptionsPickerView; import com.bigkoo.pickerview.view.TimePickerView; import com.google.gson.Gson; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.beans.CensusCrimeDetailBean; import com.tengshisoft.commonmodule.beans.SaveCrimeBean; import com.tengshisoft.commonmodule.beans.SuccessBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/special/CensusSpecialCriminalListActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/special/CensusSpecialCriminalListActivity.java index ab0ef03..f739f17 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/special/CensusSpecialCriminalListActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/special/CensusSpecialCriminalListActivity.java @@ -12,7 +12,7 @@ import android.widget.TextView; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.scwang.smart.refresh.layout.SmartRefreshLayout; import com.tengshisoft.commonmodule.adapters.CensusCriminalAdapter; import com.tengshisoft.commonmodule.beans.CensusCriminalListBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/special/CensusTroubleAddActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/special/CensusTroubleAddActivity.java index 143fdea..8405410 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/special/CensusTroubleAddActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/special/CensusTroubleAddActivity.java @@ -18,7 +18,7 @@ import com.bigkoo.pickerview.builder.TimePickerBuilder; import com.bigkoo.pickerview.view.OptionsPickerView; import com.bigkoo.pickerview.view.TimePickerView; import com.google.gson.Gson; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.beans.SaveTroubleBean; import com.tengshisoft.commonmodule.beans.SuccessBean; import com.tengshisoft.commonmodule.beans.TroubleDetailBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/special/CensusTroubleListActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/special/CensusTroubleListActivity.java index 1aa7af8..3ea512f 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/special/CensusTroubleListActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/special/CensusTroubleListActivity.java @@ -13,7 +13,7 @@ import android.widget.TextView; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.scwang.smart.refresh.layout.SmartRefreshLayout; import com.tengshisoft.commonmodule.adapters.CensusTroubleAdapter; import com.tengshisoft.commonmodule.beans.CensusTroubleListBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/schools/SchoolCaseAddActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/schools/SchoolCaseAddActivity.java index 4bbbf8b..803012e 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/schools/SchoolCaseAddActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/schools/SchoolCaseAddActivity.java @@ -30,7 +30,7 @@ import com.bigkoo.pickerview.builder.TimePickerBuilder; import com.bigkoo.pickerview.view.OptionsPickerView; import com.bigkoo.pickerview.view.TimePickerView; import com.google.gson.Gson; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.beans.AreaGridListBean; import com.tengshisoft.commonmodule.beans.SaveSchoolCaseBean; import com.tengshisoft.commonmodule.beans.SchoolCaseDetailBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/schools/SchoolCaseListActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/schools/SchoolCaseListActivity.java index 43d0ec0..c9c84da 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/schools/SchoolCaseListActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/schools/SchoolCaseListActivity.java @@ -14,7 +14,7 @@ import android.widget.TextView; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.scwang.smart.refresh.layout.SmartRefreshLayout; import com.tengshisoft.commonmodule.adapters.SchoolCaseAdapter; import com.tengshisoft.commonmodule.beans.SchoolCaseListBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/schools/SchoolEmphasesAddActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/schools/SchoolEmphasesAddActivity.java index 25a7d75..d4910f4 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/schools/SchoolEmphasesAddActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/schools/SchoolEmphasesAddActivity.java @@ -16,7 +16,7 @@ import com.alibaba.android.arouter.launcher.ARouter; import com.bigkoo.pickerview.builder.OptionsPickerBuilder; import com.bigkoo.pickerview.view.OptionsPickerView; import com.google.gson.Gson; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.beans.SaveEmphasesBean; import com.tengshisoft.commonmodule.beans.SchoolEmphasesPersonDetailBean; import com.tengshisoft.commonmodule.beans.SuccessBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/schools/SchoolEmphasesListActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/schools/SchoolEmphasesListActivity.java index e2e9cf3..07f1170 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/schools/SchoolEmphasesListActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/schools/SchoolEmphasesListActivity.java @@ -14,7 +14,7 @@ import android.widget.TextView; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.scwang.smart.refresh.layout.SmartRefreshLayout; import com.tengshisoft.commonmodule.adapters.SchoolEmphasesPersonAdapter; import com.tengshisoft.commonmodule.beans.SchoolEmphasesPersonListBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/schools/SchoolManageAddActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/schools/SchoolManageAddActivity.java index 973e937..1c89ad5 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/schools/SchoolManageAddActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/schools/SchoolManageAddActivity.java @@ -27,7 +27,7 @@ import com.baidu.mapapi.model.LatLng; import com.bigkoo.pickerview.builder.OptionsPickerBuilder; import com.bigkoo.pickerview.view.OptionsPickerView; import com.google.gson.Gson; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.beans.AreaGridListBean; import com.tengshisoft.commonmodule.beans.SaveSchoolBean; import com.tengshisoft.commonmodule.beans.SchoolDetailBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/schools/SchoolManageDetailActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/schools/SchoolManageDetailActivity.java index 07dd1cc..03fb115 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/schools/SchoolManageDetailActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/schools/SchoolManageDetailActivity.java @@ -22,7 +22,7 @@ import com.baidu.mapapi.map.MapStatusUpdateFactory; import com.baidu.mapapi.map.MarkerOptions; import com.baidu.mapapi.map.TextureMapView; import com.baidu.mapapi.model.LatLng; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.beans.SchoolDetailBean; import com.tengshisoft.commonmodule.beans.SuccessBean; import com.tengshisoft.commonmodule.nets.GridApis; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/schools/SchoolManageListActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/schools/SchoolManageListActivity.java index 03c873b..cc3553c 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/schools/SchoolManageListActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/schools/SchoolManageListActivity.java @@ -16,7 +16,7 @@ import android.widget.TextView; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; import com.gyf.immersionbar.ImmersionBar; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.jakewharton.rxbinding3.widget.RxTextView; import com.scwang.smart.refresh.layout.SmartRefreshLayout; import com.tengshisoft.commonmodule.adapters.SchoolListAdapter; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/ExpressPoiAddActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/ExpressPoiAddActivity.java index 87c2934..ee0696a 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/ExpressPoiAddActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/ExpressPoiAddActivity.java @@ -27,7 +27,7 @@ import com.baidu.mapapi.model.LatLng; import com.bigkoo.pickerview.builder.OptionsPickerBuilder; import com.bigkoo.pickerview.view.OptionsPickerView; import com.google.gson.Gson; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.beans.AreaGridListBean; import com.tengshisoft.commonmodule.beans.SaveExpressBean; import com.tengshisoft.commonmodule.beans.SuccessBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/ExpressPoiDetailActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/ExpressPoiDetailActivity.java index bb8c772..6e49b05 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/ExpressPoiDetailActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/ExpressPoiDetailActivity.java @@ -22,7 +22,7 @@ import com.baidu.mapapi.map.MapStatusUpdateFactory; import com.baidu.mapapi.map.MarkerOptions; import com.baidu.mapapi.map.TextureMapView; import com.baidu.mapapi.model.LatLng; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.beans.ExpressDetailBean; import com.tengshisoft.commonmodule.beans.SuccessBean; import com.tengshisoft.commonmodule.nets.GridApis; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/ExpressPoiEditActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/ExpressPoiEditActivity.java index 19ff1fc..1629471 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/ExpressPoiEditActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/ExpressPoiEditActivity.java @@ -27,7 +27,7 @@ import com.baidu.mapapi.model.LatLng; import com.bigkoo.pickerview.builder.OptionsPickerBuilder; import com.bigkoo.pickerview.view.OptionsPickerView; import com.google.gson.Gson; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.beans.AreaGridListBean; import com.tengshisoft.commonmodule.beans.ExpressDetailBean; import com.tengshisoft.commonmodule.beans.SaveExpressBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/ExpressPoiListActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/ExpressPoiListActivity.java index 7197da3..32aebd7 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/ExpressPoiListActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/ExpressPoiListActivity.java @@ -15,7 +15,7 @@ import android.widget.TextView; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; import com.gyf.immersionbar.ImmersionBar; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.jakewharton.rxbinding3.widget.RxTextView; import com.scwang.smart.refresh.layout.SmartRefreshLayout; import com.tengshisoft.commonmodule.adapters.ExpressListAdapter; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/KeyAreaAddActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/KeyAreaAddActivity.java index f12172d..afef5c9 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/KeyAreaAddActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/KeyAreaAddActivity.java @@ -15,7 +15,7 @@ import com.bigkoo.pickerview.builder.TimePickerBuilder; import com.bigkoo.pickerview.view.OptionsPickerView; import com.bigkoo.pickerview.view.TimePickerView; import com.google.gson.Gson; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.beans.AreaGridListBean; import com.tengshisoft.commonmodule.beans.SaveKeyAreaBean; import com.tengshisoft.commonmodule.beans.SuccessBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/KeyAreaDetailActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/KeyAreaDetailActivity.java index 6bf8821..a35bb5f 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/KeyAreaDetailActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/KeyAreaDetailActivity.java @@ -10,7 +10,7 @@ import android.widget.TextView; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.beans.KeyAreaDetailBean; import com.tengshisoft.commonmodule.beans.SuccessBean; import com.tengshisoft.commonmodule.nets.GridApis; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/KeyAreaEditActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/KeyAreaEditActivity.java index eb463ca..e9275fe 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/KeyAreaEditActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/KeyAreaEditActivity.java @@ -16,7 +16,7 @@ import com.bigkoo.pickerview.builder.TimePickerBuilder; import com.bigkoo.pickerview.view.OptionsPickerView; import com.bigkoo.pickerview.view.TimePickerView; import com.google.gson.Gson; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.beans.AreaGridListBean; import com.tengshisoft.commonmodule.beans.KeyAreaDetailBean; import com.tengshisoft.commonmodule.beans.SaveKeyAreaBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/KeyAreaListActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/KeyAreaListActivity.java index ec9fa0d..5b228b7 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/KeyAreaListActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/KeyAreaListActivity.java @@ -15,7 +15,7 @@ import android.widget.TextView; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; import com.gyf.immersionbar.ImmersionBar; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.jakewharton.rxbinding3.widget.RxTextView; import com.scwang.smart.refresh.layout.SmartRefreshLayout; import com.tengshisoft.commonmodule.adapters.KeyAreaAdapter; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/KeyPlaceAddActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/KeyPlaceAddActivity.java index a214f9a..ce5ef14 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/KeyPlaceAddActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/KeyPlaceAddActivity.java @@ -27,7 +27,7 @@ import com.baidu.mapapi.model.LatLng; import com.bigkoo.pickerview.builder.OptionsPickerBuilder; import com.bigkoo.pickerview.view.OptionsPickerView; import com.google.gson.Gson; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.beans.AreaGridListBean; import com.tengshisoft.commonmodule.beans.SaveKeyPlaceBean; import com.tengshisoft.commonmodule.beans.SuccessBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/KeyPlaceDetailActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/KeyPlaceDetailActivity.java index aba2834..1995077 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/KeyPlaceDetailActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/KeyPlaceDetailActivity.java @@ -24,7 +24,7 @@ import com.baidu.mapapi.map.MapStatusUpdateFactory; import com.baidu.mapapi.map.MarkerOptions; import com.baidu.mapapi.map.TextureMapView; import com.baidu.mapapi.model.LatLng; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.beans.KeyPlaceDetailBean; import com.tengshisoft.commonmodule.beans.SuccessBean; import com.tengshisoft.commonmodule.nets.GridApis; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/KeyPlaceEditActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/KeyPlaceEditActivity.java index 435f5ab..94dcd13 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/KeyPlaceEditActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/KeyPlaceEditActivity.java @@ -27,7 +27,7 @@ import com.baidu.mapapi.model.LatLng; import com.bigkoo.pickerview.builder.OptionsPickerBuilder; import com.bigkoo.pickerview.view.OptionsPickerView; import com.google.gson.Gson; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.beans.AreaGridListBean; import com.tengshisoft.commonmodule.beans.KeyPlaceDetailBean; import com.tengshisoft.commonmodule.beans.SaveKeyPlaceBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/KeyPlaceListActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/KeyPlaceListActivity.java index b6fc68d..83a1e82 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/KeyPlaceListActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/KeyPlaceListActivity.java @@ -15,7 +15,7 @@ import android.widget.TextView; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; import com.gyf.immersionbar.ImmersionBar; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.jakewharton.rxbinding3.widget.RxTextView; import com.scwang.smart.refresh.layout.SmartRefreshLayout; import com.tengshisoft.commonmodule.adapters.KeyPlaceAdapter; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/KeyRoadAddActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/KeyRoadAddActivity.java index 77b49e7..65849bf 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/KeyRoadAddActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/KeyRoadAddActivity.java @@ -13,7 +13,7 @@ import com.alibaba.android.arouter.launcher.ARouter; import com.bigkoo.pickerview.builder.OptionsPickerBuilder; import com.bigkoo.pickerview.view.OptionsPickerView; import com.google.gson.Gson; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.beans.AreaGridListBean; import com.tengshisoft.commonmodule.beans.SaveKeyRoadBean; import com.tengshisoft.commonmodule.beans.SuccessBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/KeyRoadDetailActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/KeyRoadDetailActivity.java index 15128b0..607a008 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/KeyRoadDetailActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/KeyRoadDetailActivity.java @@ -10,7 +10,7 @@ import android.widget.TextView; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.beans.KeyRoadDetailBean; import com.tengshisoft.commonmodule.beans.SuccessBean; import com.tengshisoft.commonmodule.nets.GridApis; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/KeyRoadEditActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/KeyRoadEditActivity.java index 85278a0..5b45cac 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/KeyRoadEditActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/KeyRoadEditActivity.java @@ -27,7 +27,7 @@ import com.alibaba.android.arouter.launcher.ARouter; import com.bigkoo.pickerview.builder.OptionsPickerBuilder; import com.bigkoo.pickerview.view.OptionsPickerView; import com.google.gson.Gson; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.beans.AreaGridListBean; import com.tengshisoft.commonmodule.beans.KeyRoadDetailBean; import com.tengshisoft.commonmodule.beans.SaveKeyRoadBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/KeyRoadListActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/KeyRoadListActivity.java index 6a0e5c0..41f2aa0 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/KeyRoadListActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/KeyRoadListActivity.java @@ -15,7 +15,7 @@ import android.widget.TextView; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; import com.gyf.immersionbar.ImmersionBar; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.jakewharton.rxbinding3.widget.RxTextView; import com.scwang.smart.refresh.layout.SmartRefreshLayout; import com.tengshisoft.commonmodule.adapters.KeyRoadAdapter; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/PenalAddActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/PenalAddActivity.java index 2849281..b973b12 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/PenalAddActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/PenalAddActivity.java @@ -13,7 +13,7 @@ import com.alibaba.android.arouter.launcher.ARouter; import com.bigkoo.pickerview.builder.TimePickerBuilder; import com.bigkoo.pickerview.view.TimePickerView; import com.google.gson.Gson; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.beans.AreaGridListBean; import com.tengshisoft.commonmodule.beans.SavePenalBean; import com.tengshisoft.commonmodule.beans.SuccessBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/PenalCaseSelActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/PenalCaseSelActivity.java index df9e8ea..1e9a7fd 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/PenalCaseSelActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/PenalCaseSelActivity.java @@ -10,7 +10,7 @@ import android.widget.ProgressBar; import android.widget.TextView; import com.alibaba.android.arouter.facade.annotation.Route; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.scwang.smart.refresh.layout.SmartRefreshLayout; import com.tengshisoft.commonmodule.adapters.PenalCaseSelAdapter; import com.tengshisoft.commonmodule.beans.PenalListBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/PenalDetailActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/PenalDetailActivity.java index 56cbf88..0b9c114 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/PenalDetailActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/PenalDetailActivity.java @@ -10,7 +10,7 @@ import android.widget.TextView; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.beans.PenalDetailBean; import com.tengshisoft.commonmodule.beans.SuccessBean; import com.tengshisoft.commonmodule.nets.GridApis; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/PenalEditActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/PenalEditActivity.java index 3365e22..361c7c4 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/PenalEditActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/PenalEditActivity.java @@ -14,7 +14,7 @@ import com.alibaba.android.arouter.launcher.ARouter; import com.bigkoo.pickerview.builder.TimePickerBuilder; import com.bigkoo.pickerview.view.TimePickerView; import com.google.gson.Gson; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.beans.AreaGridListBean; import com.tengshisoft.commonmodule.beans.PenalDetailBean; import com.tengshisoft.commonmodule.beans.SavePenalBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/PenalListActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/PenalListActivity.java index 5bd0bd0..44e7c2a 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/PenalListActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/PenalListActivity.java @@ -15,7 +15,7 @@ import android.widget.TextView; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; import com.gyf.immersionbar.ImmersionBar; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.jakewharton.rxbinding3.widget.RxTextView; import com.scwang.smart.refresh.layout.SmartRefreshLayout; import com.tengshisoft.commonmodule.adapters.PenalAdapter; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/PenalSuspicionAddActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/PenalSuspicionAddActivity.java index 0f27d74..df1bb2c 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/PenalSuspicionAddActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/PenalSuspicionAddActivity.java @@ -16,7 +16,7 @@ import com.bigkoo.pickerview.builder.TimePickerBuilder; import com.bigkoo.pickerview.view.OptionsPickerView; import com.bigkoo.pickerview.view.TimePickerView; import com.google.gson.Gson; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.beans.PenalListBean; import com.tengshisoft.commonmodule.beans.SaveSuspicionBean; import com.tengshisoft.commonmodule.beans.SuccessBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/PenalSuspicionDetailActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/PenalSuspicionDetailActivity.java index 0527610..a50552b 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/PenalSuspicionDetailActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/PenalSuspicionDetailActivity.java @@ -10,7 +10,7 @@ import android.widget.TextView; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.beans.PenalSuspicionDetailBean; import com.tengshisoft.commonmodule.beans.SuccessBean; import com.tengshisoft.commonmodule.nets.GridApis; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/PenalSuspicionEditActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/PenalSuspicionEditActivity.java index 5e493a0..19a9bcf 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/PenalSuspicionEditActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/PenalSuspicionEditActivity.java @@ -16,7 +16,7 @@ import com.bigkoo.pickerview.builder.TimePickerBuilder; import com.bigkoo.pickerview.view.OptionsPickerView; import com.bigkoo.pickerview.view.TimePickerView; import com.google.gson.Gson; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.beans.PenalListBean; import com.tengshisoft.commonmodule.beans.PenalSuspicionDetailBean; import com.tengshisoft.commonmodule.beans.SaveSuspicionBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/PenalSuspicionListActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/PenalSuspicionListActivity.java index 83f7251..23ea3fa 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/PenalSuspicionListActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/PenalSuspicionListActivity.java @@ -15,7 +15,7 @@ import android.widget.TextView; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; import com.gyf.immersionbar.ImmersionBar; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.jakewharton.rxbinding3.widget.RxTextView; import com.scwang.smart.refresh.layout.SmartRefreshLayout; import com.tengshisoft.commonmodule.adapters.PenalSuspicionListAdapter; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/PenalVictimAddActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/PenalVictimAddActivity.java index a38120a..3e177a2 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/PenalVictimAddActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/PenalVictimAddActivity.java @@ -16,7 +16,7 @@ import com.bigkoo.pickerview.builder.TimePickerBuilder; import com.bigkoo.pickerview.view.OptionsPickerView; import com.bigkoo.pickerview.view.TimePickerView; import com.google.gson.Gson; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.beans.PenalListBean; import com.tengshisoft.commonmodule.beans.SaveVictimBean; import com.tengshisoft.commonmodule.beans.SuccessBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/PenalVictimDetailActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/PenalVictimDetailActivity.java index 08a5310..6b618b4 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/PenalVictimDetailActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/PenalVictimDetailActivity.java @@ -20,7 +20,7 @@ import android.widget.TextView; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.beans.SuccessBean; import com.tengshisoft.commonmodule.beans.VictimDetailBean; import com.tengshisoft.commonmodule.nets.GridApis; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/PenalVictimEditActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/PenalVictimEditActivity.java index 0ac2411..62bc67d 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/PenalVictimEditActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/PenalVictimEditActivity.java @@ -16,7 +16,7 @@ import com.bigkoo.pickerview.builder.TimePickerBuilder; import com.bigkoo.pickerview.view.OptionsPickerView; import com.bigkoo.pickerview.view.TimePickerView; import com.google.gson.Gson; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.beans.PenalListBean; import com.tengshisoft.commonmodule.beans.SaveVictimBean; import com.tengshisoft.commonmodule.beans.SuccessBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/PenalVictimListActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/PenalVictimListActivity.java index 82908d2..5d6e041 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/PenalVictimListActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/PenalVictimListActivity.java @@ -15,7 +15,7 @@ import android.widget.TextView; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; import com.gyf.immersionbar.ImmersionBar; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.scwang.smart.refresh.layout.SmartRefreshLayout; import com.tengshisoft.commonmodule.adapters.PenalVictimListAdapter; import com.tengshisoft.commonmodule.beans.VictimListBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/tasks/TaskBusinessListActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/tasks/TaskBusinessListActivity.java index 594f244..24d72a6 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/tasks/TaskBusinessListActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/tasks/TaskBusinessListActivity.java @@ -10,7 +10,7 @@ import android.widget.TextView; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.scwang.smart.refresh.layout.SmartRefreshLayout; import com.tengshisoft.commonmodule.adapters.TaskBusinessListAdapter; import com.tengshisoft.commonmodule.beans.TaskBusinessListBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/tasks/TaskDetailActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/tasks/TaskDetailActivity.java index 1f3e8ab..d322606 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/tasks/TaskDetailActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/tasks/TaskDetailActivity.java @@ -10,7 +10,7 @@ import android.widget.TextView; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.scwang.smart.refresh.layout.SmartRefreshLayout; import com.tengshisoft.commonmodule.adapters.TaskReportListAdapter; import com.tengshisoft.commonmodule.beans.TaskReceiveDetailBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/tasks/TaskReportRecordAddActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/tasks/TaskReportRecordAddActivity.java index d79a249..267f6b4 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/tasks/TaskReportRecordAddActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/tasks/TaskReportRecordAddActivity.java @@ -21,7 +21,7 @@ import com.alibaba.android.arouter.launcher.ARouter; import com.bigkoo.pickerview.builder.TimePickerBuilder; import com.bigkoo.pickerview.view.TimePickerView; import com.google.gson.Gson; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.beans.SaveTaskReportBean; import com.tengshisoft.commonmodule.beans.SuccessBean; import com.tengshisoft.commonmodule.nets.GridApis; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/tasks/TaskReportRecordEditActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/tasks/TaskReportRecordEditActivity.java index c7c10e7..c297c9b 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/tasks/TaskReportRecordEditActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/tasks/TaskReportRecordEditActivity.java @@ -19,7 +19,7 @@ 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.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.beans.SaveTaskReportBean; import com.tengshisoft.commonmodule.beans.SuccessBean; import com.tengshisoft.commonmodule.beans.TaskReportRecordDetailBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/tasks/fragments/TaskFragment.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/tasks/fragments/TaskFragment.java index 1f4875a..13a88df 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/tasks/fragments/TaskFragment.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/tasks/fragments/TaskFragment.java @@ -8,7 +8,7 @@ import android.view.View; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; import com.google.gson.Gson; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.adapters.TaskListAdapter; import com.tengshisoft.commonmodule.beans.SaveGetTaskBean; import com.tengshisoft.commonmodule.beans.SaveTaskStateBean; diff --git a/gridmodule/src/main/res/layout/activity_census_base_search.xml b/gridmodule/src/main/res/layout/activity_census_base_search.xml index 1d1883d..e7edafe 100644 --- a/gridmodule/src/main/res/layout/activity_census_base_search.xml +++ b/gridmodule/src/main/res/layout/activity_census_base_search.xml @@ -56,6 +56,8 @@ android:paddingLeft="5dp" android:textColor="@color/black" android:textSize="12sp" + android:maxLines="1" + android:singleLine="true" tools:text="" /> @@ -63,7 +63,7 @@ @@ -94,7 +94,7 @@ @@ -143,7 +143,7 @@ @@ -158,7 +158,7 @@ @@ -173,7 +173,7 @@ @@ -189,7 +189,7 @@ @@ -204,7 +204,7 @@ @@ -219,7 +219,7 @@ @@ -236,7 +236,7 @@ @@ -251,7 +251,7 @@ diff --git a/gridmodule/src/main/res/layout/activity_census_nmigrant_add.xml b/gridmodule/src/main/res/layout/activity_census_nmigrant_add.xml index 912327a..486617c 100644 --- a/gridmodule/src/main/res/layout/activity_census_nmigrant_add.xml +++ b/gridmodule/src/main/res/layout/activity_census_nmigrant_add.xml @@ -44,7 +44,6 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/gridmodule/src/main/res/layout/activity_census_nmigrant_detail.xml b/gridmodule/src/main/res/layout/activity_census_nmigrant_detail.xml index 75573b7..5d66323 100644 --- a/gridmodule/src/main/res/layout/activity_census_nmigrant_detail.xml +++ b/gridmodule/src/main/res/layout/activity_census_nmigrant_detail.xml @@ -16,130 +16,370 @@ - + android:layout_marginTop="-20dp"> - - - + android:layout_height="wrap_content" + android:background="@drawable/shape_rectangle_white_top" + android:orientation="vertical" + android:paddingTop="15dp"> - + + + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + \ No newline at end of file diff --git a/gridmodule/src/main/res/layout/fragment_person_lib.xml b/gridmodule/src/main/res/layout/fragment_person_lib.xml index d8f411c..0271081 100644 --- a/gridmodule/src/main/res/layout/fragment_person_lib.xml +++ b/gridmodule/src/main/res/layout/fragment_person_lib.xml @@ -102,7 +102,7 @@ android:drawableLeft="@drawable/ic_lib_crowd_icon" android:drawablePadding="10dp" android:padding="10dp" - android:text="正常人群" + android:text="普通人群" android:textColor="@color/black" android:textSize="18dp" /> @@ -135,20 +135,20 @@ android:visibility="gone" /> - + + + + + + + + + + + + + + () { - @Override - public void onSubscribe(@NonNull Disposable d) { + @Override + public void onSubscribe(@NonNull Disposable d) { - } + } - @Override - public void onNext(@NonNull JsonObject obj) { - try { - String rhUrl = obj.get("rhUrl").getAsString(); - String rhPort = obj.get("rhPort").getAsString(); - String rhHttpsPort = obj.get("rhHttpsPort").getAsString(); - if (!TextUtils.isEmpty(rhUrl) && !TextUtils.isEmpty(rhPort)) { - UserLgUtils.setRhPort(Integer.parseInt(rhPort)); - UserLgUtils.setRhUrl(rhUrl); - UserLgUtils.setHttpsPort(rhHttpsPort); - if (AppUtils.isSupportCall()) { - //判断是否可以视频通话 - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { - initHWClound();//初始化华为融合通信 - getUserExpandInfo(); + @Override + public void onNext(@NonNull JsonObject obj) { + try { + String rhUrl = obj.get("rhUrl").getAsString(); + String rhPort = obj.get("rhPort").getAsString(); + String rhHttpsPort = obj.get("rhHttpsPort").getAsString(); + if (!TextUtils.isEmpty(rhUrl) && !TextUtils.isEmpty(rhPort)) { + UserLgUtils.setRhPort(Integer.parseInt(rhPort)); + UserLgUtils.setRhUrl(rhUrl); + UserLgUtils.setHttpsPort(rhHttpsPort); + if (AppUtils.isSupportCall()) { + //判断是否可以视频通话 + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { + initHWClound();//初始化华为融合通信 + getUserExpandInfo(); + } + } } + } catch (Exception e) { + e.printStackTrace(); } } - } catch (Exception e) { - e.printStackTrace(); - } - } - @Override - public void onError(@NonNull Throwable e) { - e.printStackTrace(); - } + @Override + public void onError(@NonNull Throwable e) { + e.printStackTrace(); + } - @Override - public void onComplete() { + @Override + public void onComplete() { - } - }); + } + }); } diff --git a/mainmodule/src/main/java/com/tengshisoft/mainmodule/base/SplashActivity.java b/mainmodule/src/main/java/com/tengshisoft/mainmodule/base/SplashActivity.java index cc108e5..0e4a6c8 100644 --- a/mainmodule/src/main/java/com/tengshisoft/mainmodule/base/SplashActivity.java +++ b/mainmodule/src/main/java/com/tengshisoft/mainmodule/base/SplashActivity.java @@ -5,7 +5,7 @@ import android.view.View; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; import com.gyf.immersionbar.ImmersionBar; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.mainmodule.R; import com.tenlionsoft.baselib.constant.LionActions; import com.tenlionsoft.baselib.constant.PathConfig; diff --git a/mainmodule/src/main/java/com/tengshisoft/mainmodule/fragments/GridMainFragment.java b/mainmodule/src/main/java/com/tengshisoft/mainmodule/fragments/GridMainFragment.java index 4fdbd59..b4b824b 100755 --- a/mainmodule/src/main/java/com/tengshisoft/mainmodule/fragments/GridMainFragment.java +++ b/mainmodule/src/main/java/com/tengshisoft/mainmodule/fragments/GridMainFragment.java @@ -24,6 +24,7 @@ import com.tengshisoft.commonmodule.beans.AreaGridListBean; import com.tengshisoft.commonmodule.beans.IncidentCountBean; import com.tengshisoft.commonmodule.beans.IncidentListBean; import com.tengshisoft.commonmodule.beans.KnowLedgeListBean; +import com.tengshisoft.commonmodule.beans.NoticeListBean; import com.tengshisoft.commonmodule.nets.GridApis; import com.tengshisoft.mainmodule.BaseLineTextAdapter; import com.tengshisoft.mainmodule.R; @@ -40,7 +41,6 @@ import com.tenlionsoft.baselib.core.widget.base.FunctionNumAdapter; import com.tenlionsoft.baselib.core.widget.base.FunctionTitleNumAdapter; import com.tenlionsoft.baselib.core.widget.views.ChooseFuncDialogView; import com.tenlionsoft.baselib.utils.ExceptionHandler; -import com.tenlionsoft.baselib.utils.TimeUtils; import com.tenlionsoft.baselib.utils.UserLgUtils; import org.jetbrains.annotations.NotNull; @@ -53,8 +53,10 @@ import java.util.List; import butterknife.BindView; import butterknife.ButterKnife; import butterknife.Unbinder; +import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers; import io.reactivex.rxjava3.core.Observer; import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.schedulers.Schedulers; /** * 作者: Adam @@ -106,6 +108,12 @@ public class GridMainFragment extends BaseFragment { ImageView mIvKnowEmpty; @BindView(R2.id.ll_know) LinearLayout mLlKnow; + @BindView(R2.id.ll_notice) + LinearLayout mLlNotice; + @BindView(R2.id.tv_notice_1) + TextView mTvNotice1; + @BindView(R2.id.tv_notice_2) + TextView mTvNotice2; private Disposable mDisposable; private Unbinder mBind; private List mFuncs = new ArrayList<>(); @@ -177,6 +185,49 @@ public class GridMainFragment extends BaseFragment { mSrlView.setEnableRefresh(false); initContentView(); getMineGridList(); + getNoticeList(); + } + + /** + * 获取通知公告 + */ + private void getNoticeList() { + RetrofitManager.getInstance() + .create(GridApis.class) + .getArticleList("", PathConfig.NOTICE_CID, "1",UserLgUtils.getToken()) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(new Observer() { + @Override + public void onSubscribe(@io.reactivex.rxjava3.annotations.NonNull Disposable d) { + + } + + @Override + public void onNext(@io.reactivex.rxjava3.annotations.NonNull NoticeListBean noticeListBean) { + if (noticeListBean.getRows() != null && noticeListBean.getRows().size() > 0) { + mLlNotice.setVisibility(View.VISIBLE); + if (noticeListBean.getRows().size() > 1) { + mTvNotice1.setText(noticeListBean.getRows().get(0).getTitle()); + mTvNotice2.setText(noticeListBean.getRows().get(1).getTitle()); + } else { + mTvNotice1.setText(noticeListBean.getRows().get(0).getTitle()); + } + } else { + mLlNotice.setVisibility(View.GONE); + } + } + + @Override + public void onError(@io.reactivex.rxjava3.annotations.NonNull Throwable e) { + mLlNotice.setVisibility(View.GONE); + } + + @Override + public void onComplete() { + + } + }); } /** @@ -281,6 +332,9 @@ public class GridMainFragment extends BaseFragment { .build(PathConfig.PATH_MODULE_COMMON_ACTIVITY_KNOWLEDGE_LIBRARY_LIST) .withString("type", "grid") .navigation());//知识库 + mLlNotice.setOnClickListener(v -> ARouter.getInstance() + .build(PathConfig.PATH_MODULE_COMMON_ACTIVITY_NOTICE_LIST) + .navigation()); for (int i = 0; i < mBtnStrs.length; i++) { FuncBean bean = new FuncBean(); bean.setText(mBtnStrs[i]); @@ -322,7 +376,7 @@ public class GridMainFragment extends BaseFragment { //我的上报数量 RetrofitManager.getInstance() .create(GridApis.class) - .getIncidentMineList("", 1 + "","","", UserLgUtils.getToken()) + .getIncidentMineList("", 1 + "", "", "", UserLgUtils.getToken()) .compose(RxTransformer.getTransformer()) .subscribe(new Observer() { @Override diff --git a/mainmodule/src/main/res/layout/fragment_main_grid.xml b/mainmodule/src/main/res/layout/fragment_main_grid.xml index 12e1adc..33d7019 100644 --- a/mainmodule/src/main/res/layout/fragment_main_grid.xml +++ b/mainmodule/src/main/res/layout/fragment_main_grid.xml @@ -216,6 +216,8 @@ tools:spanCount="5" /> + android:textSize="@dimen/text_14" /> + android:textSize="@dimen/text_14" /> diff --git a/modulemap/src/main/java/com/tengshisoft/modulemap/activitys/SelPointActivity.java b/modulemap/src/main/java/com/tengshisoft/modulemap/activitys/SelPointActivity.java index 32afed4..7936026 100644 --- a/modulemap/src/main/java/com/tengshisoft/modulemap/activitys/SelPointActivity.java +++ b/modulemap/src/main/java/com/tengshisoft/modulemap/activitys/SelPointActivity.java @@ -27,7 +27,7 @@ import com.baidu.mapapi.search.geocode.GeoCoder; import com.baidu.mapapi.search.geocode.OnGetGeoCoderResultListener; import com.baidu.mapapi.search.geocode.ReverseGeoCodeOption; import com.baidu.mapapi.search.geocode.ReverseGeoCodeResult; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.modulemap.R; import com.tengshisoft.modulemap.R2; import com.tengshisoft.modulemap.common.Location84;