simpleViewHolder.recycler_view_title.setText(talkRecommendBean.title); 149
        if (talkRecommendBean.likeNums == 0) {
147 150
            simpleViewHolder.recycler_view_zan.setVisibility(View.GONE);
148 151
        }else if(talkRecommendBean.likeNums > 999){
149 152
            simpleViewHolder.recycler_view_zan.setVisibility(View.VISIBLE);

+ 1 - 0
app/src/main/java/com/electric/chargingpile/data/HomePageBean.java

@ -21,6 +21,7 @@ public class HomePageBean {
21 21
        public String carSeriesName;
22 22
        public String topicName;
23 23
        public String coverImgUrl;
24
        public String shareUrl;
24 25
        public String[] imgUrls;
25 26
        public int topicId;
26 27
        public int likeNums;

+ 1 - 1
app/src/main/java/com/electric/chargingpile/fragment/SvVideoShowView.java

@ -391,7 +391,7 @@ public class SvVideoShowView implements View.OnClickListener {
391 391
    }
392 392
393 393
    public void updateView() {
394
        ToastUtil.showToast(activity, "updateView", Toast.LENGTH_LONG);
394
//        ToastUtil.showToast(activity, "updateView", Toast.LENGTH_LONG);
395 395
    }
396 396
397 397
    public void initAndPlay() {

BIN
app/src/main/res/drawable-xxhdpi/icon_main_qa.png


+ 19 - 1
app/src/main/res/layout/activity_personal_page.xml

@ -139,7 +139,8 @@
139 139
        android:id="@+id/xrefreshview"
140 140
        android:layout_width="match_parent"
141 141
        android:layout_height="match_parent"
142
        android:background="#fff">
142
        android:background="#fff"
143
        android:visibility="visible">
143 144
144 145
        <android.support.v7.widget.RecyclerView
145 146
            android:id="@+id/recycler_view_test_rv"
@ -148,4 +149,21 @@
148 149
            android:scrollbars="vertical" />
149 150
    </com.andview.refreshview.XRefreshView>
150 151
152
    <LinearLayout
153
        android:id="@+id/no_content_view"
154
        android:layout_width="match_parent"
155
        android:layout_height="match_parent"
156
        android:gravity="center_horizontal"
157
        android:background="@color/color_white"
158
        android:orientation="vertical">
159
        <TextView
160
            android:layout_width="match_parent"
161
            android:layout_height="wrap_content"
162
            android:gravity="center"
163
            android:text="@string/personal_shar_info_content"
164
            android:layout_marginTop="147dp"
165
            android:textSize="14sp"
166
            android:textColor="#555555"/>
167
    </LinearLayout>
168
151 169
</LinearLayout>

+ 65 - 0
app/src/main/res/layout/activity_topic_details_info.xml

@ -34,6 +34,7 @@
34 34
        </LinearLayout>
35 35
    </com.electric.chargingpile.view.PullToZoomScrollView3>
36 36
37
37 38
    <RelativeLayout
38 39
        android:id="@+id/rl_title"
39 40
        android:layout_width="fill_parent"
@ -79,4 +80,68 @@
79 80
    </RelativeLayout>
80 81
81 82
</RelativeLayout>
83
84
    <ImageView
85
        android:id="@+id/iv_ask"
86
        android:layout_width="56dp"
87
        android:layout_height="56dp"
88
        android:layout_alignParentRight="true"
89
        android:layout_alignParentBottom="true"
90
        android:layout_marginRight="15dp"
91
        android:layout_marginBottom="72dp"
92
        android:src="@drawable/app_share_talk_icon"/>
93
94
    <RelativeLayout
95
        android:layout_width="match_parent"
96
        android:layout_height="match_parent"
97
        android:background="@color/white"
98
        android:id="@+id/no_net_view"
99
        android:visibility="gone">
100
101
        <RelativeLayout
102
            android:id="@+id/rl_title_nonet"
103
            android:layout_width="fill_parent"
104
            android:layout_height="44dp"
105
            android:background="@color/white"
106
            android:visibility="visible">
107
108
            <ImageView
109
                android:id="@+id/iv_back_nonet"
110
                android:layout_width="wrap_content"
111
                android:layout_height="match_parent"
112
                android:layout_alignParentLeft="true"
113
                android:layout_centerVertical="true"
114
                android:contentDescription="@null"
115
                android:paddingLeft="15dp"
116
                android:paddingRight="15dp"
117
                android:src="@drawable/icon_lvback1119" />
118
119
        </RelativeLayout>
120
121
        <TextView
122
            android:id="@+id/banquan"
123
            android:layout_width="wrap_content"
124
            android:layout_height="wrap_content"
125
            android:layout_marginTop="260dp"
126
            android:text="小主网络跑掉了,请检查网络~"
127
            android:gravity="center"
128
            android:layout_centerHorizontal="true"
129
            android:textSize="14sp"
130
            android:textColor="#555555" />
131
132
        <TextView
133
            android:id="@+id/request_refresh"
134
            android:layout_width="144dp"
135
            android:layout_height="40dp"
136
            android:layout_centerHorizontal="true"
137
            android:layout_marginTop="20dp"
138
            android:layout_below="@+id/banquan"
139
            android:text="点击重新尝试"
140
            android:gravity="center"
141
            android:textSize="14sp"
142
            android:textColor="#555555"
143
            android:background="@drawable/bg_route_line_818181"/>
144
145
    </RelativeLayout>
146
82 147
</RelativeLayout>

+ 19 - 0
app/src/main/res/layout/activity_topic_infos_content.xml

@ -149,7 +149,26 @@
149 149
        app:refreshEnabled="false"
150 150
        app:loadMoreFooterLayout="@layout/layout_irecyclerview_load_more_footer"
151 151
        android:overScrollMode="never"
152
        android:visibility="visible"
152 153
        />
153 154
155
    <LinearLayout
156
        android:id="@+id/no_content_view"
157
        android:layout_width="match_parent"
158
        android:layout_height="match_parent"
159
        android:gravity="center_horizontal"
160
        android:background="@color/color_white"
161
        android:orientation="vertical"
162
        android:visibility="gone">
163
        <TextView
164
            android:layout_width="match_parent"
165
            android:layout_height="wrap_content"
166
            android:gravity="center"
167
            android:text="还没有任何内容哦,快来抢沙发~"
168
            android:layout_marginTop="147dp"
169
            android:textSize="14sp"
170
            android:textColor="#555555"/>
171
    </LinearLayout>
172
154 173
155 174
</LinearLayout>

+ 11 - 1
app/src/main/res/layout/view_show_comment.xml

@ -85,7 +85,7 @@
85 85
        android:layout_marginTop="150dp"
86 86
        android:gravity="center_horizontal"
87 87
        android:orientation="vertical"
88
        android:visibility="gone">
88
        android:visibility="visible">
89 89
90 90
        <TextView
91 91
            android:layout_width="123dp"
@ -96,6 +96,16 @@
96 96
            android:visibility="gone"
97 97
            android:textSize="14sp" />
98 98
99
        <ProgressBar
100
            android:id="@+id/pull_to_refresh_progress"
101
            style="?android:attr/progressBarStyleSmall"
102
            android:gravity="center"
103
            android:layout_width="wrap_content"
104
            android:layout_height="wrap_content"
105
            android:indeterminateTint="@color/click"
106
            android:layout_gravity="center"
107
            android:indeterminate="true" />
108
99 109
        <TextView
100 110
            android:layout_width="wrap_content"
101 111
            android:layout_height="wrap_content"

+ 1 - 1
app/src/main/res/layout/viewpager_guide_four.xml

@ -11,7 +11,7 @@
11 11
        android:layout_centerHorizontal="true"
12 12
13 13
        android:contentDescription="@null"
14
        android:src="@drawable/bg_w_4" />
14
        android:src="@drawable/bg_w_41" />
15 15
16 16
    <ImageView
17 17
        android:layout_width="200dp"

+ 2 - 0
app/src/main/res/values/strings.xml

@ -204,4 +204,6 @@
204 204
    <string name="refresh_load_succeed">Loading succeeded</string>
205 205
    <string name="refresh_load_succeed_nomore">That\'s All!</string>
206 206
    <string name="refresh_load_fail">Loading failed</string>
207
    <string name="personal_shar_info_content">快来分享吧\n
208
小主大家都很期待你的精彩内容哦</string>
207 209
</resources>

代码修改 · 4645b9db66 - Gogs: Go Git Service
huyuguo 7 gadi atpakaļ
vecāks
revīzija
4645b9db66

+ 0 - 4
app/src/main/java/com/electric/chargingpile/activity/ChatContentListActivity.java

@ -234,19 +234,16 @@ public class ChatContentListActivity extends AppCompatActivity {
234 234
    public class ChatContentAdapter extends FragmentStatePagerAdapter {
235 235
236 236
        public Map<String, ChatContentFragment> map = new HashMap<>();
237
        private FragmentManager fm;
238 237
        private Handler handler;
239 238
240 239
        public ChatContentAdapter(FragmentManager fm, Handler handler) {
241 240
            super(fm);
242
            this.fm = fm;
243 241
            this.handler = handler;
244 242
        }
245 243
246 244
        @Override
247 245
        public android.support.v4.app.Fragment getItem(int i) {
248 246
            ChatContentFragment fragment = ChatContentFragment.newInstance(i, from);
249
            fragment.fm = fm;
250 247
            fragment.handler = handler;
251 248
            map.put(i + "", fragment);
252 249
            return fragment;
@ -267,7 +264,6 @@ public class ChatContentListActivity extends AppCompatActivity {
267 264
268 265
269 266
    public static class ChatContentFragment extends Fragment implements View.OnClickListener {
270
        private FragmentManager fm;
271 267
        private Handler handler;
272 268
        private static final String ARG_INDEX = "index";
273 269
        private static final String ARG_FROM = "from";

+ 1 - 1
app/src/main/java/com/electric/chargingpile/fragment/ChatContentCommentListDialogFragment.java

@ -30,7 +30,7 @@ public class ChatContentCommentListDialogFragment extends DialogFragment {
30 30
    @NonNull
31 31
    @Override
32 32
    public Dialog onCreateDialog(Bundle savedInstanceState) {
33
        Dialog dialog = new Dialog(getActivity(), R.style.BottomDialog);
33
        Dialog dialog = new Dialog(getActivity(), R.style.CommentDialog);
34 34
        // 外部点击设置为可取消
35 35
        dialog.setCancelable(true);
36 36
        dialog.setCanceledOnTouchOutside(true);

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

@ -5,7 +5,6 @@
5 5
    xmlns:tools="http://schemas.android.com/tools"
6 6
    android:layout_width="match_parent"
7 7
    android:layout_height="match_parent"
8
    android:background="#ff00ff"
9 8
    tools:background="#68b8be">
10 9
11 10
    <android.support.constraint.ConstraintLayout

+ 6 - 0
app/src/main/res/values/styles.xml

@ -13,6 +13,12 @@
13 13
        <item name="android:windowSoftInputMode">stateAlwaysVisible</item><!--显示软件盘-->
14 14
    </style>
15 15

16
    <style name="CommentDialog" parent="@style/AppTheme">
17
        <item name="android:layout_width">match_parent</item>
18
        <item name="android:layout_height">wrap_content</item>
19
        <item name="android:windowIsFloating">true</item>
20
    </style>
21

16 22
    <style name="actionBarTheme" parent="ThemeOverlay.AppCompat.Dark.ActionBar">
17 23
        <item name="android:textColorPrimary">@android:color/primary_text_light</item>
18 24
    </style>