ソースを参照

工具类修改

niusongtao@dl-cg.com 5 年 前
コミット
cdad425bbd

+ 1 - 1
base_library/src/main/java/com/mgtech/base_library/http/RxUtil.java

@@ -54,7 +54,7 @@ public class RxUtil {
         return observable -> {
             Observable<T> compose = observable.subscribeOn(Schedulers.io())
                     .observeOn(AndroidSchedulers.mainThread())
-                    .compose(ProgressUtils.applyProgressBar(fragment.getActivity()))
+//                    .compose(ProgressUtils.applyProgressBar(fragment.getActivity()))
                     .compose(fragment.bindUntilEvent(FragmentEvent.DESTROY));
             if (showLoading) {
                 return compose.compose(ProgressUtils.applyProgressBar(fragment.getActivity()));

+ 2 - 2
base_library/src/main/java/com/mgtech/base_library/http/common/HttpConfig.java

@@ -15,8 +15,8 @@ package com.mgtech.base_library.http.common;
 public class HttpConfig {
     public static final long HTTP_TIME = 30;
 
-    public static final String BASE_URL = "http://172.14.3.81:9400/"; //测试
-//    public static final String BASE_URL = "http://tennor.bikot.cn/";//发布
+//    public static final String BASE_URL = "http://172.14.1.61:9400/"; //测试
+    public static final String BASE_URL = "http://api.basss.pj.dl-cg.com/";//大连环境
 //    public static final String BASE_URL = "http://172.14.1.86:8320/";//本地
 //    public static final String BASE_URL = "http://172.14.3.33:8320/";//本地
 

+ 2 - 0
base_library/src/main/java/com/mgtech/base_library/util/FormatNumUtil.java

@@ -85,6 +85,8 @@ public class FormatNumUtil {
             return new BigDecimal(amount).toPlainString();
         } catch (NumberFormatException e){
             return amount;
+        } catch (Exception e){
+            return "0";
         }
     }
 

+ 6 - 5
base_library/src/main/res/layout/layout_common_user_item.xml

@@ -8,27 +8,28 @@
 
     <ImageView
         android:id="@+id/item_left_image"
-        android:layout_width="@dimen/dp_25"
-        android:layout_height="@dimen/dp_25"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
     <TextView
         android:id="@+id/item_title_text"
-        android:layout_width="wrap_content"
+        android:layout_width="@dimen/dp_0"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/dp_10"
         android:textColor="@color/black_text"
         android:textSize="@dimen/sp_14"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toEndOf="@+id/item_left_image"
+        app:layout_constraintEnd_toStartOf="@id/item_detail_text"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_goneMarginStart="@dimen/dp_15" />
 
     <TextView
         android:id="@+id/item_detail_text"
-        android:layout_width="@dimen/dp_0"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/dp_10"
         android:layout_marginEnd="@dimen/dp_10"
@@ -46,7 +47,7 @@
         android:id="@+id/item_right_image"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginEnd="@dimen/dp_10"
+        android:layout_marginEnd="@dimen/dp_15"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent" />