Merge branch 'master' of http://113.105.137.151:22280/lify/rvapp into dev_im

# Conflicts:
#	RvClient/build.gradle
#	RvClient/src/main/java/com/xxfc/rv/WelcomeActivity.java
#	plugin_member/src/main/res/layout/activity_member.xml

RvClient/src/main/java/com/xxfc/rv/MainActivity.java

@@ -414,7 +414,6 @@ public class MainActivity extends BaseActivity<CommonPresenter>{
         if (mAdapter != null) {
             mAdapter.getCurrentFragment().onActivityResult(requestCode, resultCode, data);
         }
-
     }
 
     @Override

RvClient/src/main/java/com/xxfc/rv/WelcomeActivity.java

@@ -70,8 +70,7 @@ public class WelcomeActivity extends BaseActivity<CommonPresenter> {
         AppConfig appConfig = (AppConfig) RvCache.getInstance().get(CacheEnum.IM_CONFIG);
         if (appConfig == null) {
             if (!NetworkUtil.isNetworkAvailable(getApplicationContext())) {
-                Toast.makeText(getApplicationContext(), "网络异常，im初始化失败，请退出重进", Toast.LENGTH_SHORT).show();
-                return;
+                Toast.makeText(getApplicationContext(), "网络异常，im初始化失败，请退出重进", Toast.LENGTH_LONG).show();
             }
         } else {
             isImInitOk = true;

RvWrapper/src/main/java/com/ruiwenliu/wrapper/receiver/NetWorkReceiver.java

@@ -4,7 +4,6 @@ import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.net.ConnectivityManager;
-import android.util.Log;
 import android.widget.Toast;
 
 import com.base.utils.tools.android.NetworkUtil;

module_home/src/main/java/com/rv/home/rv/module/ui/main/home/ConfirmOrderActivity.java

@@ -161,6 +161,7 @@ public class ConfirmOrderActivity extends BaseStatusActivity<CommonPresenter> {
     private final int TYPE_REQUEST_DRIVING = 3;
 
 
+
     private boolean serviceFeeShow = true;
     private boolean cleanFeeShow = true;
     private OrderDataBean dataBean;
@@ -664,6 +665,16 @@ public class ConfirmOrderActivity extends BaseStatusActivity<CommonPresenter> {
             tvLayoutMemberHint.setVisibility(View.VISIBLE);
             llLayoutMemberHint.setVisibility(View.VISIBLE);
             tvFreeCarDays.setText("（剩余" + memberData.getRentFreeDays() + "天）");
+            if (memberData.getRentFreeDays() > 0) {
+                swbtnMember.setChecked(true);
+                isMemberType = 1;
+                dataBean.setRentFreeDay(1);
+                couponAmount = 0;
+                getPayMoney();
+            }else {
+                dataBean.setRentFreeDay(0);
+                isMemberType = 0;
+            }
         }
 
         if (priceBean.getData() != null) {

plugin_im/src/main/java/com/rv/im/adapter/ChatContentAdapter.java

@@ -368,11 +368,17 @@ public class ChatContentAdapter extends RecyclerView.Adapter<RecyclerView.ViewHo
                     VoicePlayer.instance().playVoice(holder.chatVoiceAnimView);
                     ChatMessageServiceImp.getInstance(mContext).setVoicePlay(bean.getPackId());
                     listener.voicePlay(bean);
+                    holder.imgState.setVisibility(View.GONE);
                 }
         );
         if (!TextUtils.isEmpty(bean.getContent())) {
             holder.chatVoiceAnimView.fillData(bean);
         }
+        if (bean.getVoiceStatus() == 0) {
+            holder.imgState.setVisibility(View.VISIBLE);
+        } else {
+            holder.imgState.setVisibility(View.GONE);
+        }
     }
 
     private void setToVoiceContentView(ChatMessage bean, MsgToVoiceHolder holder) {

plugin_share/src/main/java/com/rv/share/ShareActivity.java

@@ -73,14 +73,14 @@ public class ShareActivity extends BaseStatusActivity<SharePresenter> {
 
     private void setView(PersonShareBean.PersonShareInfo data) {
 
-        Resources resource= getBaseContext().getResources();
-        ColorStateList csl= resource.getColorStateList(R.color.share_number_color);
+        Resources resource = getBaseContext().getResources();
+        ColorStateList csl = resource.getColorStateList(R.color.share_number_color);
 
         SpannableStringBuilder spanBuilder = new SpannableStringBuilder(data.getTotalIncome() + "元");
         spanBuilder.setSpan(new TextAppearanceSpan(null, Typeface.NORMAL, DisplayUtil.sp2px(this, 24), csl, null), 0, data.getTotalIncome().toString().length(), Spanned.SPAN_EXCLUSIVE_INCLUSIVE);
         tvAmount.setText(spanBuilder);
 
-        int total = data.getInviteNumber() + data.getActivatedNumber() ;
+        int total = data.getInviteNumber() + data.getActivatedNumber();
         SpannableStringBuilder spanBuilder1 = new SpannableStringBuilder(total + "人");
         spanBuilder1.setSpan(new TextAppearanceSpan(null, Typeface.NORMAL, DisplayUtil.sp2px(this, 24), csl, null), 0, String.valueOf(total).length(), Spanned.SPAN_EXCLUSIVE_INCLUSIVE);
         tvPersonInval.setText(spanBuilder1);
@@ -151,7 +151,8 @@ public class ShareActivity extends BaseStatusActivity<SharePresenter> {
         } else if (id == R.id.ll_comein) {
             startActivity(PopularizeActivity.getIntent(getApplicationContext()));
         } else if (id == R.id.tv_ruler) {
-            startActivity(new Intent(getApplicationContext(), ShareRulerActivity.class));
+            String url = RvFrameConfig.HOST_H5_DETAIL + "/h5/appHtml/view/promotionAward.html";
+            startActivity(WebViewActivity.getIntent(this, url, "推广有奖规则"));
         }
     }