diff --git a/README.md b/README.md index 0a16e24..b2d52f8 100644 --- a/README.md +++ b/README.md @@ -21,3 +21,8 @@ 1.事件详情添加上报人名称 2.登录页添加标识 ``` + +### 2023-5-8 +``` +1.修复Bug Inconsistency detected (在清除了mData后续要重新刷新Adapter) +``` \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index d04dab7..8fa5e6f 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -5,13 +5,13 @@ plugins { android { signingConfigs { release { - storeFile file('/Users/adam/Documents/tengshi.jks') + storeFile file('/Users/adam/Documents/work/keystore/tengshi.jks') storePassword 'aaa111!!!' keyAlias = 'tengshi' keyPassword 'aaa111!!!' } debug { - storeFile file('/Users/adam/Documents/tengshi.jks') + storeFile file('/Users/adam/Documents/work/keystore/tengshi.jks') storePassword 'aaa111!!!' keyAlias = 'tengshi' keyPassword 'aaa111!!!' diff --git a/chatmodule/src/main/java/com/tengshisoft/chatmodule/fragments/DeptContactFragment.java b/chatmodule/src/main/java/com/tengshisoft/chatmodule/fragments/DeptContactFragment.java index fbbbbdf..69a6857 100644 --- a/chatmodule/src/main/java/com/tengshisoft/chatmodule/fragments/DeptContactFragment.java +++ b/chatmodule/src/main/java/com/tengshisoft/chatmodule/fragments/DeptContactFragment.java @@ -5,6 +5,9 @@ import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.ProgressBar; +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.tengshisoft.chatmodule.R; @@ -24,8 +27,6 @@ import com.tenlionsoft.baselib.core.widget.views.TypeFaceTextView; 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; @@ -96,10 +97,10 @@ public class DeptContactFragment extends BaseFragment { UserDatabaseBean bean = (UserDatabaseBean) o; //跳转用户详情 ARouter.getInstance() - .build(PathConfig.PATH_MODULE_CHAT_ADDRESSLIST_USER_DETAIL) - .withString("id", bean.getUserId()) - .withString("deptId", bean.getDepartmentId()) - .navigation(); + .build(PathConfig.PATH_MODULE_CHAT_ADDRESSLIST_USER_DETAIL) + .withString("id", bean.getUserId()) + .withString("deptId", bean.getDepartmentId()) + .navigation(); } else { //部门 DeptDatabaseBean bean = (DeptDatabaseBean) o; @@ -132,56 +133,56 @@ public class DeptContactFragment extends BaseFragment { mAdapter.setData(mDatas); refreshStateView(STATE_LOAD); Observable.create((ObservableOnSubscribe) emitter -> { - try { - if (mDataBase == null) { - mDataBase = AppDatabase.getInstance(mActivity.getApplication()); - mDeptDao = mDataBase.getDeptDao(); - mUserDao = mDataBase.getUserDao(); - } - List beans = mDeptDao.queryByPid(mSelDeptId); - List deptId = mUserDao.getUsersByDeptId(mSelDeptId); - if (beans.size() > 0 || deptId.size() > 0) { - mDatas.addAll(beans); - mDatas.addAll(deptId); - emitter.onNext(1); - } else { - emitter.onNext(2); - } - } catch (Exception e) { - emitter.onError(new Exception("加载失败")); - } - }) - .subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()) - .subscribe(new Observer() { - @Override - public void onSubscribe(@NonNull Disposable d) { - - } - - @Override - public void onNext(@NonNull Integer o) { - if (o == 1) { - //有数据 - mAdapter.setData(mDatas); - refreshStateView(STATE_SUCCESS); - } else { - //没有数据 - refreshStateView(STATE_EMPTY); + try { + if (mDataBase == null) { + mDataBase = AppDatabase.getInstance(mActivity.getApplication()); + mDeptDao = mDataBase.getDeptDao(); + mUserDao = mDataBase.getUserDao(); + } + List beans = mDeptDao.queryByPid(mSelDeptId); + List deptId = mUserDao.getUsersByDeptId(mSelDeptId); + if (beans.size() > 0 || deptId.size() > 0) { + mDatas.addAll(beans); + mDatas.addAll(deptId); + emitter.onNext(1); + } else { + emitter.onNext(2); + } + } catch (Exception e) { + emitter.onError(new Exception("加载失败")); } - } + }) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(new Observer() { + @Override + public void onSubscribe(@NonNull Disposable d) { - @Override - public void onError(@NonNull Throwable e) { - //加载失败 - refreshStateView(STATE_ERROR); - } + } - @Override - public void onComplete() { + @Override + public void onNext(@NonNull Integer o) { + mAdapter.setData(mDatas); + if (o == 1) { + //有数据 + refreshStateView(STATE_SUCCESS); + } else { + //没有数据 + refreshStateView(STATE_EMPTY); + } + } - } - }); + @Override + public void onError(@NonNull Throwable e) { + //加载失败 + refreshStateView(STATE_ERROR); + } + + @Override + public void onComplete() { + + } + }); } @Override