Merge branch 'master' of /Users/dxh/android_chargingpile with conflicts.

.gitignore

@@ -14,6 +14,7 @@
bin/
gen/
out/
bugly/
# Gradle files
.gradle/

app/src/main/java/com/electric/chargingpile/adapter/LayoutAdapter.java

@@ -151,6 +151,11 @@ public class LayoutAdapter extends RecyclerView.Adapter<IViewHolder> {
        else
            simpleViewHolder.is_top_view.setVisibility(View.VISIBLE);
        if (talkRecommendBean.targetType == 23)
            simpleViewHolder.info_id_video_icon.setVisibility(View.VISIBLE);
        else
            simpleViewHolder.info_id_video_icon.setVisibility(View.GONE);
//        Glide.with(context)
//                .load(talkRecommendBean.coverImgUrl)
//                .asBitmap()//强制Glide返回一个Bitmap对象
@@ -187,7 +192,7 @@ public class LayoutAdapter extends RecyclerView.Adapter<IViewHolder> {
        // 最最关键一步，设置当前view占满列数，这样就可以占据两列实现头部了
        clp.setFullSpan(true);
        LinearLayoutManager linearLayoutManager = new LinearLayoutManager(context);
        linearLayoutManager.setOrientation(LinearLayoutManager.VERTICAL);
        linearLayoutManager.setOrientation(LinearLayoutManager.HORIZONTAL);
        simpleHeaderViewHolder.header_recy.setLayoutManager(linearLayoutManager);
        TalkRecommendHeaderAdapter talkRecommendHeaderAdapter = new TalkRecommendHeaderAdapter(context);
        simpleHeaderViewHolder.header_recy.setAdapter(talkRecommendHeaderAdapter);
@@ -202,6 +207,7 @@ public class LayoutAdapter extends RecyclerView.Adapter<IViewHolder> {
        TextView is_top_view;
        ImageView user_avater;
        ImageView info_bg_icon;
        ImageView info_id_video_icon;
        LinearLayout cardview;
        public SimpleViewHolder(View view) {
@@ -212,6 +218,7 @@ public class LayoutAdapter extends RecyclerView.Adapter<IViewHolder> {
            recycler_view_zan = (TextView) view.findViewById(R.id.recycler_view_zan);
            user_avater = (ImageView) view.findViewById(R.id.user_avater);
            info_bg_icon = (ImageView) view.findViewById(R.id.info_bg_icon);
            info_id_video_icon = (ImageView) view.findViewById(R.id.info_id_video_icon);
            cardview = (LinearLayout) view.findViewById(R.id.cardview);
            RelativeLayout.LayoutParams lpImg = (RelativeLayout.LayoutParams) info_bg_icon.getLayoutParams();

app/src/main/java/com/electric/chargingpile/adapter/TalkRecommendHeaderAdapter.java

@@ -14,6 +14,7 @@ import com.aspsine.irecyclerview.IViewHolder;
import com.electric.chargingpile.R;
import com.electric.chargingpile.data.TalkRecommendBean;
import com.electric.chargingpile.iview.RecyclerItemTypeClickListener;
import com.electric.chargingpile.util.ScreenUtils;
import com.squareup.picasso.Picasso;
import java.util.ArrayList;
@@ -24,12 +25,14 @@ public class TalkRecommendHeaderAdapter extends RecyclerView.Adapter<IViewHolder
    private LayoutInflater layoutInflater;
    private RecyclerItemTypeClickListener onRecyclerItemClickListener;
    private ArrayList<TalkRecommendBean> lists;
    private int screenWidth;
    public TalkRecommendHeaderAdapter(Context context) {
        this.context = context;
        layoutInflater = LayoutInflater.from(context);
        lists = new ArrayList<>();
        screenWidth = ScreenUtils.getScreenWidth(context);
    }
@@ -101,12 +104,19 @@ public class TalkRecommendHeaderAdapter extends RecyclerView.Adapter<IViewHolder
        private ImageView iv_header_bg;
        private TextView header_title;
        private TextView header_title_joinin;
        private RelativeLayout cardview;
        public CollectionCarsHolder(View itemView) {
            super(itemView);
            iv_header_bg = (ImageView) itemView.findViewById(R.id.iv_header_bg);
            header_title = (TextView) itemView.findViewById(R.id.header_title);
            header_title_joinin = (TextView) itemView.findViewById(R.id.header_title_joinin);
            cardview = (RelativeLayout) itemView.findViewById(R.id.cardview);
            ViewGroup.LayoutParams rl = (ViewGroup.LayoutParams)cardview.getLayoutParams();
            rl.width = screenWidth/4+50;
            rl.height = screenWidth/4+10;
            cardview.setLayoutParams(rl);
            itemView.setOnClickListener(new View.OnClickListener() {
                @Override

app/src/main/java/com/electric/chargingpile/application/MainApplication.java

@@ -87,7 +87,7 @@ public class MainApplication extends MultiDexApplication {
	public static String password = "";
//	public static String url = "http://123.57.6.131";
	public static String url = "http://cdz.evcharge.cc";
	public static String urlNew = "http://123.56.67.7:84/api/0200";
	public static String urlNew = "http://123.56.67.7:83/api/0200";
	public static String pic_url = "http://cdz.evcharge.cc/zhannew/uploadfile/";
//	public static String url = "https://cdz.d1ev.com";
	public static String build_flag = "0";

app/src/main/res/layout/activity_talk.xml

@@ -133,7 +133,8 @@
                android:layout_height="wrap_content"
                android:layout_gravity="center_horizontal"
                android:layout_marginTop="8dp"
                android:src="@drawable/icon_main_qa_selected" />
                android:src="@drawable/app_tab_chat_icon" />
                <!--android:src="@drawable/icon_main_qa_selected" />-->
            <TextView
                android:layout_width="wrap_content"

app/src/main/res/layout/activity_talkrecommend_header_item.xml

@@ -2,15 +2,15 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/apk/res-auto"
    android:id="@+id/cardview"
    android:layout_width="wrap_content"
    android:layout_height="wrap_content"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
    android:layout_marginLeft="15dp"
    >
    <ImageView
        android:id="@+id/iv_header_bg"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:layout_width="match_parent"
        android:layout_height="match_parent"
        android:minHeight="85dp"
        android:minWidth="94dp"
        android:background="#44000000"/>
@@ -33,6 +33,7 @@
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:layout_alignBottom="@+id/iv_header_bg"
        android:layout_marginBottom="5dp"
        android:padding="5dp"
        android:text="1111"
        android:singleLine="true"

app/src/main/res/layout/app_talk_item_recylerview.xml

@@ -9,19 +9,32 @@
    android:minHeight="100dp"
    android:paddingBottom="5dp">
    <ImageView
        android:id="@+id/info_bg_icon"
    <RelativeLayout
        android:id="@+id/info_bg_icon_bg"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:background="#999999"
        android:minWidth="200dp"
        android:minHeight="160dp" />
        android:gravity="center">
        <ImageView
            android:id="@+id/info_bg_icon"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:minWidth="200dp"
            android:minHeight="160dp" />
        <ImageView
            android:id="@+id/info_id_video_icon"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:layout_centerInParent="true"
            android:src="@drawable/app_talk_video_icon" />
    </RelativeLayout>
    <TextView
        android:id="@+id/is_top_view"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:layout_alignRight="@+id/info_bg_icon"
        android:layout_alignRight="@+id/info_bg_icon_bg"
        android:layout_marginRight="10dp"
        android:layout_marginTop="10dp"
        android:paddingTop="1dp"
@@ -37,9 +50,9 @@
        android:id="@+id/recycler_view_title"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:layout_below="@+id/info_bg_icon"
        android:layout_alignLeft="@+id/info_bg_icon"
        android:layout_alignRight="@+id/info_bg_icon"
        android:layout_below="@+id/info_bg_icon_bg"
        android:layout_alignLeft="@+id/info_bg_icon_bg"
        android:layout_alignRight="@+id/info_bg_icon_bg"
        android:layout_marginBottom="16dp"
        android:paddingTop="11dp"
        android:paddingLeft="10dp"
@@ -55,8 +68,8 @@
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:layout_below="@+id/recycler_view_title"
        android:layout_alignLeft="@+id/info_bg_icon"
        android:layout_alignRight="@+id/info_bg_icon">
        android:layout_alignLeft="@+id/info_bg_icon_bg"
        android:layout_alignRight="@+id/info_bg_icon_bg">
        <TextView
            android:id="@+id/recycler_view_zan"
@@ -81,8 +94,7 @@
            android:id="@+id/user_avater"
            android:layout_width="20dp"
            android:layout_height="20dp"
            android:layout_centerVertical="true"
            android:background="@color/color_888888" />
            android:layout_centerVertical="true"/>
        <TextView
            android:id="@+id/user_avater_name"

app/src/main/res/values/strings.xml

@@ -18,7 +18,7 @@
    <string name="updated_at">上次更新于%1$s前</string>
    <string name="updated_just_now">刚刚更新</string>
    <string name="time_error">时间有问题</string>
    <string name="string_tab_qa">互助</string>
    <string name="string_tab_qa">聊聊</string>
    <string name="app_name">充电桩</string>
    <string name="main_name">主界面</string>