流动人口修改

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"
 

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();

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";//部件列表

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;
+    }
+}

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;
     }

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;

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";
 

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<PersonSearchBean> 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<PersonFlowSearchBean> doSearchFLowPerson(@Path("idCardNumber") String card, @Header("token") String token);
 
     /**
      * 获取当前用户拓展信息

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;

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;

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) {

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;

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;
 

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;
 

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;
 
 

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;

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;
 

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;

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;
 

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;

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() {

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) {

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.
      * <p>The pattern is {@code yyyy-MM-dd HH:mm:ss}.</p>
@@ -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,

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);
+    }
+}

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"

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="" />
 

baselib/src/main/res/values-v26/style.xml

@@ -508,7 +508,7 @@
         <item name="android:layout_height">wrap_content</item>
         <item name="android:layout_weight">1</item>
         <item name="android:drawablePadding">5dp</item>
-        <item name="android:drawableRight">@drawable/ic_arrow_gray_down</item>
+        <item name="android:drawableRight">@drawable/ic_arrow_sort_gray</item>
         <item name="android:gravity">right</item>
         <item name="android:padding">5dp</item>
         <item name="android:layout_gravity">center_vertical</item>

baselib/src/main/res/values-v27/style.xml

@@ -508,7 +508,7 @@
         <item name="android:layout_height">wrap_content</item>
         <item name="android:layout_weight">1</item>
         <item name="android:drawablePadding">5dp</item>
-        <item name="android:drawableRight">@drawable/ic_arrow_gray_down</item>
+        <item name="android:drawableRight">@drawable/ic_arrow_sort_gray</item>
         <item name="android:gravity">right</item>
         <item name="android:padding">5dp</item>
         <item name="android:layout_gravity">center_vertical</item>

baselib/src/main/res/values/attrs.xml

@@ -21,6 +21,7 @@
     <attr name="iconRight" format="reference" />
     <attr name="duration_max" format="integer" />
     <attr name="text_type_cus" format="integer" />
+    <attr name="txt_is_bold" format="integer" />
     <declare-styleable name="JCameraView">
         <attr name="iconSize" />
         <attr name="iconMargin" />
@@ -32,6 +33,11 @@
     <!--属性集合-->
     <declare-styleable name="TypeFaceTextView">
         <attr name="text_type_cus" />
+
+    </declare-styleable>
+    <declare-styleable name="TypeBoldTextView">
+        <attr name="txt_is_bold" />
+
     </declare-styleable>
     <declare-styleable name="DiffuseView">
         <attr name="diffuse_color" />
@@ -187,7 +193,7 @@
     </declare-styleable>
 
     <declare-styleable name="PageNavigationView">
-        <attr name="NavigationPaddingTop" format="dimension"/>
-        <attr name="NavigationPaddingBottom" format="dimension"/>
+        <attr name="NavigationPaddingTop" format="dimension" />
+        <attr name="NavigationPaddingBottom" format="dimension" />
     </declare-styleable>
 </resources>

baselib/src/main/res/values/styles.xml

@@ -522,7 +522,7 @@
         <item name="android:layout_height">wrap_content</item>
         <item name="android:layout_weight">1</item>
         <item name="android:drawablePadding">5dp</item>
-        <item name="android:drawableRight">@drawable/ic_arrow_gray_down</item>
+        <item name="android:drawableRight">@drawable/ic_arrow_sort_gray</item>
         <item name="android:gravity">right</item>
         <item name="android:padding">5dp</item>
         <item name="android:layout_gravity">center_vertical</item>

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;
 

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

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;
 

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;
 

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;

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;
 

commonmodule/src/main/AndroidManifest.xml

@@ -3,6 +3,18 @@
     package="com.tengshisoft.commonmodule">
 
     <application>
+        <activity
+            android:name=".activitys.notice.NoticeDetailActivity"
+            android:launchMode="singleTop"
+            android:screenOrientation="portrait"
+            android:windowSoftInputMode="adjustPan|stateHidden"
+            android:exported="false" />
+        <activity
+            android:name=".activitys.notice.NoticeListActivity"
+            android:launchMode="singleTop"
+            android:screenOrientation="portrait"
+            android:windowSoftInputMode="adjustPan|stateHidden"
+            android:exported="false" />
         <activity
             android:name=".activitys.logs.GridIncidentStatisticsActivity"
             android:exported="false"

commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/cases/IncidentArchiveListActivity.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.scwang.smart.refresh.layout.SmartRefreshLayout;
 import com.tengshisoft.commonmodule.R;
 import com.tengshisoft.commonmodule.R2;

commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/cases/IncidentCenterCheckDetailActivity.java

@@ -28,7 +28,7 @@ import com.baidu.mapapi.model.LatLng;
 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.scwang.smart.refresh.layout.SmartRefreshLayout;
 import com.tengshisoft.commonmodule.R;
 import com.tengshisoft.commonmodule.R2;

commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/cases/IncidentCenterCheckListActivity.java

@@ -23,7 +23,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.R;
 import com.tengshisoft.commonmodule.R2;

commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/cases/IncidentCheckDetailActivity.java

@@ -42,7 +42,7 @@ import com.baidu.mapapi.model.LatLng;
 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.scwang.smart.refresh.layout.SmartRefreshLayout;
 import com.tengshisoft.commonmodule.R;
 import com.tengshisoft.commonmodule.R2;

commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/cases/IncidentCheckListActivity.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.R;

commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/cases/IncidentComponentSelActivity.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;

commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/cases/IncidentDeferExamineDetailActivity.java

@@ -30,7 +30,7 @@ import com.baidu.mapapi.model.LatLng;
 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.adapters.IncidentTagListAdapter;

commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/cases/IncidentDeferExamineListActivity.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.tenlionsoft.baselib.constant.PathConfig;

commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/cases/IncidentDetailActivity.java

@@ -31,7 +31,7 @@ import com.baidu.mapapi.model.LatLng;
 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.scwang.smart.refresh.layout.SmartRefreshLayout;
 import com.tengshisoft.commonmodule.R;
 import com.tengshisoft.commonmodule.R2;

commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/cases/IncidentDoneListActivity.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.R;

commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/cases/IncidentEditActivity.java

@@ -29,7 +29,7 @@ import com.baidu.mapapi.model.LatLng;
 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.scwang.smart.refresh.layout.SmartRefreshLayout;
 import com.tengshisoft.commonmodule.R;
 import com.tengshisoft.commonmodule.R2;

commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/cases/IncidentHandleActivity.java

@@ -43,7 +43,6 @@ import com.baidu.mapapi.model.LatLng;
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.request.RequestOptions;
 import com.google.gson.Gson;
-import com.hjq.toast.ToastUtils;
 import com.tengshisoft.commonmodule.R;
 import com.tengshisoft.commonmodule.R2;
 import com.tengshisoft.commonmodule.adapters.DeferRecordAdapter;
@@ -77,6 +76,7 @@ import com.tenlionsoft.baselib.core.widget.views.CenterTimeAndIntputView;
 import com.tenlionsoft.baselib.core.widget.views.ItemSplitDivider;
 import com.tenlionsoft.baselib.utils.ExceptionHandler;
 import com.tenlionsoft.baselib.utils.LogUtils;
+import com.tenlionsoft.baselib.utils.ToastUtils;
 import com.tenlionsoft.baselib.utils.UIUtil;
 import com.tenlionsoft.baselib.utils.UserLgUtils;
 

commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/cases/IncidentHandleListActivity.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.R;

commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/cases/IncidentListActivity.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.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;

commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/cases/IncidentOverseeDetailOrReplyActivity.java

@@ -9,7 +9,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.tengshisoft.commonmodule.R;
 import com.tengshisoft.commonmodule.R2;
 import com.tengshisoft.commonmodule.beans.IncidentOverseeDetailBean;

commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/cases/IncidentReportActivity.java

@@ -43,7 +43,7 @@ import com.bigkoo.pickerview.view.OptionsPickerView;
 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;
@@ -921,7 +921,12 @@ public class IncidentReportActivity extends BaseActivity {
     private void getTypeDatas() {
         ProgressDialog dialog = UIUtil.initDialog(mActivity, "获取中...");
         dialog.show();
-        RetrofitManager.getInstance().create(GridApis.class).getCaseTypeListAll(UserLgUtils.getToken()).subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer<List<CaseTypeBean>>() {
+        RetrofitManager.getInstance()
+                .create(GridApis.class)
+                .getCaseTypeListAll(UserLgUtils.getToken())
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new Observer<List<CaseTypeBean>>() {
             @Override
             public void onSubscribe(@NonNull Disposable d) {
 

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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<NoticeDetailBean>() {
+                    @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<objs.length;i++)  " +
+                "{"
+                + "var img = objs[i];   " +
+                "  img.style.maxWidth = '100%';" +
+                "  img.style.height = 'auto'; " +
+                "}" +
+                "})()");
+    }
+
+    @Override
+    protected void doSearchByTitle() {
+
+    }
+
+    @Override
+    protected void clearSearch() {
+
+    }
+}

commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/notice/NoticeListActivity.java

@@ -0,0 +1,186 @@
+package com.tengshisoft.commonmodule.activitys.notice;
+
+import android.app.ProgressDialog;
+import android.graphics.Color;
+import android.text.TextUtils;
+import android.view.View;
+
+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.gyf.immersionbar.ImmersionBar;
+import com.tenlionsoft.baselib.utils.ToastUtils;
+import com.scwang.smart.refresh.layout.SmartRefreshLayout;
+import com.tengshisoft.commonmodule.R;
+import com.tengshisoft.commonmodule.R2;
+import com.tengshisoft.commonmodule.adapters.NoticeListAdapter;
+import com.tengshisoft.commonmodule.beans.NoticeListBean;
+import com.tengshisoft.commonmodule.nets.GridApis;
+import com.tenlionsoft.baselib.constant.PathConfig;
+import com.tenlionsoft.baselib.core.retrofit_net.RetrofitManager;
+import com.tenlionsoft.baselib.core.widget.base.BaseActivity;
+import com.tenlionsoft.baselib.core.widget.views.CustomStateView;
+import com.tenlionsoft.baselib.core.widget.views.ItemSplitDivider;
+import com.tenlionsoft.baselib.utils.ExceptionHandler;
+import com.tenlionsoft.baselib.utils.UIUtil;
+import com.tenlionsoft.baselib.utils.UserLgUtils;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import butterknife.Unbinder;
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
+import io.reactivex.rxjava3.annotations.NonNull;
+import io.reactivex.rxjava3.core.Observer;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.schedulers.Schedulers;
+
+@Route(path = PathConfig.PATH_MODULE_COMMON_ACTIVITY_NOTICE_LIST)
+public class NoticeListActivity extends BaseActivity {
+
+
+    @BindView(R2.id.rlv_components)
+    public RecyclerView mRlvComponents;
+    @BindView(R2.id.srl_content)
+    public SmartRefreshLayout mSrlContent;
+    @BindView(R2.id.csv_state)
+    public CustomStateView mCsvState;
+    private Unbinder mBind;
+    private List<NoticeListBean.RowsBean> 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<NoticeListBean>() {
+                    @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() {
+
+    }
+}

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;

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;