diff --git a/app/build.gradle b/app/build.gradle
index 0e3e630..ac6eae5 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -3,13 +3,13 @@ apply plugin: 'com.android.application'
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/baselib/src/main/res/drawable/shape_rectangle_white_top.xml b/baselib/src/main/res/drawable/shape_rectangle_white_top.xml
index 4a54d43..14a189b 100755
--- a/baselib/src/main/res/drawable/shape_rectangle_white_top.xml
+++ b/baselib/src/main/res/drawable/shape_rectangle_white_top.xml
@@ -3,6 +3,6 @@
android:shape="rectangle">
+ android:topLeftRadius="20dp"
+ android:topRightRadius="20dp" />
\ No newline at end of file
diff --git a/chatmodule/src/main/res/layout/item_contact_user_layout.xml b/chatmodule/src/main/res/layout/item_contact_user_layout.xml
index 186862c..9c7672d 100644
--- a/chatmodule/src/main/res/layout/item_contact_user_layout.xml
+++ b/chatmodule/src/main/res/layout/item_contact_user_layout.xml
@@ -3,6 +3,8 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
+ android:layout_margin="5dp"
+ android:background="@drawable/shape_rectangle_white"
android:orientation="vertical"
android:padding="10dp">
diff --git a/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/logs/IncidentLogActivity.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/logs/IncidentLogActivity.java
index b8b6032..34f7bbe 100644
--- a/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/logs/IncidentLogActivity.java
+++ b/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/logs/IncidentLogActivity.java
@@ -1,5 +1,10 @@
package com.tengshisoft.commonmodule.activitys.logs;
+import android.text.TextUtils;
+
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
import com.alibaba.android.arouter.facade.annotation.Route;
import com.scwang.smart.refresh.layout.SmartRefreshLayout;
import com.tengshisoft.commonmodule.R;
@@ -16,8 +21,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;
@@ -77,7 +80,11 @@ public class IncidentLogActivity extends BaseActivity {
mAdapter = new IncidentLogAdapter(mActivity, mDatas);
mRlvContent.setLayoutManager(new LinearLayoutManager(mActivity));
mRlvContent.setAdapter(mAdapter);
- getLogList();
+ if (TextUtils.isEmpty(mBusinessId)) {
+ refreshView(STATE_LOAD_EMPTY);
+ } else {
+ getLogList();
+ }
}
/**
@@ -85,37 +92,37 @@ public class IncidentLogActivity extends BaseActivity {
*/
private void getLogList() {
RetrofitManager.getInstance()
- .create(GridApis.class)
- .getIncidentLogList(mBusinessId, UserLgUtils.getToken())
- .subscribeOn(Schedulers.io())
- .observeOn(AndroidSchedulers.mainThread())
- .subscribe(new Observer>() {
- @Override
- public void onSubscribe(@NonNull Disposable d) {
+ .create(GridApis.class)
+ .getIncidentLogList(mBusinessId, UserLgUtils.getToken())
+ .subscribeOn(Schedulers.io())
+ .observeOn(AndroidSchedulers.mainThread())
+ .subscribe(new Observer>() {
+ @Override
+ public void onSubscribe(@NonNull Disposable d) {
- }
-
- @Override
- public void onNext(@NonNull List incidentLogBeans) {
- if (incidentLogBeans.size() > 0) {
- refreshView(STATE_LOAD_SUCCESS);
- mDatas = incidentLogBeans;
- mAdapter.setData(mDatas);
- } else {
- refreshView(STATE_LOAD_EMPTY);
}
- }
- @Override
- public void onError(@NonNull Throwable e) {
- refreshView(STATE_LOAD_ERROR);
- ExceptionHandler.handleException(e);
- }
+ @Override
+ public void onNext(@NonNull List incidentLogBeans) {
+ if (incidentLogBeans.size() > 0) {
+ refreshView(STATE_LOAD_SUCCESS);
+ mDatas = incidentLogBeans;
+ mAdapter.setData(mDatas);
+ } else {
+ refreshView(STATE_LOAD_EMPTY);
+ }
+ }
- @Override
- public void onComplete() {
+ @Override
+ public void onError(@NonNull Throwable e) {
+ refreshView(STATE_LOAD_ERROR);
+ ExceptionHandler.handleException(e);
+ }
- }
- });
+ @Override
+ public void onComplete() {
+
+ }
+ });
}
}
\ No newline at end of file
diff --git a/commonmodule/src/main/res/layout/activity_incident_detail.xml b/commonmodule/src/main/res/layout/activity_incident_detail.xml
index 2e3865b..28ff9c6 100644
--- a/commonmodule/src/main/res/layout/activity_incident_detail.xml
+++ b/commonmodule/src/main/res/layout/activity_incident_detail.xml
@@ -9,7 +9,7 @@
@@ -66,7 +66,8 @@
android:id="@+id/et_appraise_content"
style="@style/item_content_edit"
android:hint="请输入评价内容"
- android:minLines="2" />
+ android:minLines="2"
+ tools:ignore="TouchTargetSizeCheck" />
@@ -101,7 +102,8 @@
android:progressTint="@color/yellow1"
android:rating="3"
android:secondaryProgressTint="@color/yellow1"
- android:stepSize="1" />
+ android:stepSize="1"
+ tools:ignore="SpeakableTextPresentCheck" />
@@ -137,7 +139,8 @@
android:progressTint="@color/yellow1"
android:rating="3"
android:secondaryProgressTint="@color/yellow1"
- android:stepSize="1" />
+ android:stepSize="1"
+ tools:ignore="SpeakableTextPresentCheck" />
@@ -156,7 +159,8 @@
android:paddingBottom="5dp"
android:text="保存评价"
android:textColor="@color/white"
- android:textSize="15sp" />
+ android:textSize="15sp"
+ tools:ignore="TouchTargetSizeCheck" />
@@ -364,6 +368,7 @@
android:id="@+id/rlv_photos"
android:layout_width="match_parent"
android:layout_height="wrap_content"
+ tools:ignore="SpeakableTextPresentCheck"
tools:itemCount="1"
tools:listitem="@layout/item_show_photo_smail"
tools:visibility="visible" />