huyuguo %!s(int64=5) %!d(string=hace) años
padre
commit
49bf58e1c2

+ 1 - 1
app/src/main/java/com/electric/chargingpile/activity/TopicDetailActivity.java

@ -141,7 +141,7 @@ public class TopicDetailActivity extends AppCompatActivity implements View.OnCli
141 141
            public void onItemClickListener(int position, int index) {
142 142
                Intent intent =  new Intent(TopicDetailActivity.this, ChatContentListActivity.class);
143 143
                intent.putExtra("from", ChatContentListActivity.FROM_TOPIC_DETAIL);
144
                intent.putExtra("index", index);
144
                intent.putExtra("index", position - 1);
145 145
                startActivityForResult(intent, ChatContentListActivity.REQUEST_CODE_TOPIC_DETAIL);
146 146
            }
147 147
        });

+ 1 - 1
app/src/main/java/com/electric/chargingpile/activity/UserPageActivity.java

@ -144,7 +144,7 @@ public class UserPageActivity extends AppCompatActivity implements View.OnClickL
144 144
            public void onItemClickListener(int position, int index) {
145 145
                Intent intent = new Intent(UserPageActivity.this, ChatContentListActivity.class);
146 146
                intent.putExtra("from", ChatContentListActivity.FROM_USER_PAGE);
147
                intent.putExtra("index", index);
147
                intent.putExtra("index", position);
148 148
                startActivityForResult(intent, ChatContentListActivity.REQUEST_CODE_USER_PAGE);
149 149
            }
150 150
        });

+ 4 - 4
app/src/main/java/com/electric/chargingpile/application/MainApplication.java

@ -73,10 +73,10 @@ public class MainApplication extends MultiDexApplication {
73 73
    public static String firstPoint = "";
74 74
    public static Boolean firstSsyd;
75 75
    public static String password = "";
76
//    public static String url = "http://59.110.68.162";// 充电桩测试环境
77
    public static String url = "http://cdz.evcharge.cc";// 充电桩正式环境
78
//    public static String urlNew = "http://123.56.67.7:83/api/0200";// 一电测试环境
79
    public static String urlNew = "https://api.touchev.com:83/api/0200";// 一电正式环境
76
    public static String url = "http://59.110.68.162";// 充电桩测试环境
77
//    public static String url = "http://cdz.evcharge.cc";// 充电桩正式环境
78
    public static String urlNew = "http://123.56.67.7:83/api/0200";// 一电测试环境
79
//    public static String urlNew = "https://api.touchev.com:83/api/0200";// 一电正式环境
80 80
    public static String pic_url = "http:/s/cdz.evcharge.cc/zhannew/uploadfile/";
81 81
    //	public static String url = "https://cdz.d1ev.com";
82 82
    public static String build_flag = "0";

+ 1 - 0
app/src/main/res/layout/fragment_chat_content_pictures.xml

@ -111,6 +111,7 @@
111 111
                    android:id="@+id/topicTitle"
112 112
                    android:layout_width="wrap_content"
113 113
                    android:layout_height="wrap_content"
114
                    android:maxLines="1"
114 115
                    android:paddingLeft="5dp"
115 116
                    android:textColor="#ffffff"
116 117
                    android:textSize="11sp"

+ 3 - 2
app/src/main/res/layout/fragment_chat_content_video.xml

@ -50,10 +50,10 @@
50 50
        android:id="@+id/statusBar"
51 51
        android:layout_width="match_parent"
52 52
        android:layout_height="20dp"
53
        tools:background="#76daff"
54 53
        app:layout_constraintLeft_toLeftOf="parent"
55 54
        app:layout_constraintRight_toRightOf="parent"
56
        app:layout_constraintTop_toTopOf="parent" />
55
        app:layout_constraintTop_toTopOf="parent"
56
        tools:background="#76daff" />
57 57
58 58
    <!-- 导航栏 -->
59 59
    <android.support.constraint.ConstraintLayout
@ -127,6 +127,7 @@
127 127
                    android:id="@+id/topicTitle"
128 128
                    android:layout_width="wrap_content"
129 129
                    android:layout_height="wrap_content"
130
                    android:maxLines="1"
130 131
                    android:paddingLeft="5dp"
131 132
                    android:textColor="#ffffff"
132 133
                    android:textSize="11sp"