bug修复

MyFrame/src/main/java/com/frame/base/url/Constance.java

@@ -61,4 +61,6 @@ public final class Constance {
     public static final String ACTIVITY_URL_PATGENERATEPOSTER="/discovery/other/PatGeneratePosterActivity";
 
     public static final String ACTIVITY_URL_POSTERACTIVITY="/poster/plugin/PosterActivity";
+
+    public static final String ACTIVITY_URL_CARPOSTERACTIVITY="/poster/plugin/CarPosterActivity";
 }

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

@@ -178,7 +178,7 @@ public class RvClientApplication extends FrameApp {
 
                 //是否屏蔽系统字体大小对 AndroidAutoSize 的影响, 如果为 true, App 内的字体的大小将不会跟随系统设置中字体大小的改变
                 //如果为 false, 则会跟随系统设置中字体大小的改变, 默认为 false
-//                .setExcludeFontScale(true)
+                .setExcludeFontScale(true)
 
                 //屏幕适配监听器
                 .setOnAdaptListener(new onAdaptListener() {

RvFrame/src/main/java/com/frame/rv/config/CommonApi.java

 package com.frame.rv.config;
 
-public interface CommonApi extends RvFrameConfig{
+public interface CommonApi extends RvFrameConfig {
 
     //行为记录保存
-    public static String RVENTHUSIAST_APP_UNAUTH_SAVE =RvFrameConfig.HOST + "/api/user/behavior/customerBehaviorNotes/app/unauth/save";
+    public static String RVENTHUSIAST_APP_UNAUTH_SAVE = RvFrameConfig.HOST + "/api/user/behavior/customerBehaviorNotes/app/unauth/save";
 
-    String TOUR_SENDMESSAGE = RvFrameConfig.HOST + "/api/universal/message/sendMessage"; // 分享积分
+    String TOUR_SENDMESSAGE = RvFrameConfig.HOST + "/api/universal/message/app/unauth/sendMessage"; // 分享积分
 }

RvWrapper/src/main/java/com/ruiwenliu/wrapper/base/presenter/CommonPresenter.java

@@ -46,8 +46,8 @@ public class CommonPresenter extends MvpPresenter {
             customerid = OkGoUtil.getYkId();
             customertype = "1";
         }
-        postBodyData(RvFrameConfig.HOST, 20,CommonApi.RVENTHUSIAST_APP_UNAUTH_SAVE,BaseBean.class, new SaveOnClick(customertype, customerid, type, typeid), headMap,false);
-//        postBodyData2(RvFrameConfig.HOST, CommonApi.RVENTHUSIAST_APP_UNAUTH_SAVE, new SaveOnClick(customertype, customerid, type, typeid), headMap);
+//        postBodyData(RvFrameConfig.HOST, 20,CommonApi.RVENTHUSIAST_APP_UNAUTH_SAVE,BaseBean.class, new SaveOnClick(customertype, customerid, type, typeid), headMap,false);
+        postBodyData2(RvFrameConfig.HOST, CommonApi.RVENTHUSIAST_APP_UNAUTH_SAVE, new SaveOnClick(customertype, customerid, type, typeid), headMap);
     }
 
 

RvWrapper/src/main/java/com/ruiwenliu/wrapper/http/RxRequestResult2.java

+package com.ruiwenliu.wrapper.http;
+
+import com.ruiwenliu.wrapper.base.BaseBean;
+import com.ruiwenliu.wrapper.base.BaseView;
+import io.reactivex.observers.DisposableObserver;
+import okhttp3.ResponseBody;
+import retrofit2.Response;
+
+/**
+ * Created by Amuse
+ * Data:2019/1/9 0009
+ * Desc:
+ */
+
+public class RxRequestResult2<T extends BaseBean, V extends BaseView<T>> extends DisposableObserver<Response<ResponseBody>> {
+
+    public RxRequestResult2() {
+
+    }
+
+    @Override
+    public void onNext(Response<ResponseBody> response) {
+
+    }
+
+    @Override
+    public void onError(Throwable e) {
+
+    }
+
+    @Override
+    public void onComplete() {
+
+    }
+}
\ No newline at end of file

RvWrapper/src/main/java/com/ruiwenliu/wrapper/presenter/MvpPresenter.java

@@ -7,6 +7,7 @@ import com.ruiwenliu.wrapper.base.BaseBean;
 import com.ruiwenliu.wrapper.base.BaseView;
 import com.ruiwenliu.wrapper.http.HttpApi;
 import com.ruiwenliu.wrapper.http.RxRequestResult;
+import com.ruiwenliu.wrapper.http.RxRequestResult2;
 
 import java.util.Map;
 import java.util.Observable;
@@ -309,8 +310,8 @@ public abstract class MvpPresenter<V extends BaseView> extends RetrofitPresenter
     }
 
 
-    public <T extends BaseBean> void postBodyData2(String baseUrl,  String url, Object bean, Map<String, Object> mapHead) {
-        createService(HttpApi.class, baseUrl).rxPostBody(url, bean, mapHead);
+    public <T extends BaseBean> void postBodyData2(String baseUrl, String url, Object bean, Map<String, Object> mapHead) {
+        toSubscribe(createService(HttpApi.class, baseUrl).rxPostBody(url, bean, mapHead), new RxRequestResult2<>(), 100);
     }
 
     /**

build.gradle

@@ -50,7 +50,7 @@ ext {
     compileSdkVersion = 28
     buildToolsVersion = "28.0.3"
     minSdkVersion = 19
-    targetSdkVersion = 28
+    targetSdkVersion = 26
     versionCode = 1
     versionName = "1.0"
     supportVersion = '28.0.0'

component_utils/src/main/java/com/rv/component/utils/ZxingUtils.java

@@ -15,6 +15,54 @@ import java.util.Map;
 
 public class ZxingUtils {
 
+
+    public static Bitmap createQR(String content, int widthPix, int heightPix) {
+        try {
+            //配置参数
+            Map<EncodeHintType, Object> hints = new HashMap<>();
+            hints.put(EncodeHintType.CHARACTER_SET, "utf-8");
+            //容错级别
+            hints.put(EncodeHintType.ERROR_CORRECTION, ErrorCorrectionLevel.H);
+            //设置空白边距的宽度
+            hints.put(EncodeHintType.MARGIN, 1); //default is 4
+
+            // 图像数据转换，使用了矩阵转换
+            BitMatrix bitMatrix = null;
+            try {
+                bitMatrix = new QRCodeWriter().encode(content, BarcodeFormat.QR_CODE, widthPix,
+                        heightPix, hints);
+            } catch (WriterException e) {
+                e.printStackTrace();
+            }
+            int[] pixels = new int[widthPix * heightPix];
+            // 下面这里按照二维码的算法，逐个生成二维码的图片，
+            // 两个for循环是图片横列扫描的结果
+            for (int y = 0; y < heightPix; y++) {
+                for (int x = 0; x < widthPix; x++) {
+                    if (bitMatrix.get(x, y)) {
+                        pixels[y * widthPix + x] = 0xff000000;
+                    } else {
+                        pixels[y * widthPix + x] = 0xffffffff;
+                    }
+                }
+            }
+
+            // 生成二维码图片的格式，使用ARGB_8888
+            Bitmap bitmap = Bitmap.createBitmap(widthPix, heightPix, Bitmap.Config.ARGB_8888);
+            bitmap.setPixels(pixels, 0, widthPix, 0, 0, widthPix, heightPix);
+
+            //必须使用compress方法将bitmap保存到文件中再进行读取。直接返回的bitmap是没有任何压缩的，
+            // 内存消耗巨大！
+            return bitmap;
+//            return bitmap != null && bitmap.compress(Bitmap.CompressFormat.JPEG, 100);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+        return null;
+    }
+
+
     public static Bitmap createQRImage(String content, int widthPix, int heightPix,
                                        Bitmap logoBm) {
         try {

module_camp/build.gradle

@@ -47,6 +47,7 @@ dependencies {
     implementation 'com.android.support.constraint:constraint-layout:1.1.3'
     annotationProcessor 'com.jakewharton:butterknife-compiler:9.0.0-rc1'
     annotationProcessor 'com.alibaba:arouter-compiler:1.1.4'
+    implementation 'com.alibaba:fastjson:1.2.21'
     api project(':RvWrapper')
     api project(':component_control')
     api project(':component_resource')

module_camp/src/main/java/com/rv/camp/camp/CampDetailActivity.java

@@ -21,11 +21,14 @@ import android.widget.ProgressBar;
 import com.alibaba.android.arouter.facade.annotation.Autowired;
 import com.alibaba.android.arouter.facade.annotation.Route;
 import com.alibaba.android.arouter.launcher.ARouter;
+import com.alibaba.fastjson.JSON;
 import com.frame.base.url.Constance;
+import com.frame.rv.config.CommonApi;
 import com.frame.rv.config.RvFrameConfig;
 import com.ruiwenliu.wrapper.SPConstance;
 import com.ruiwenliu.wrapper.base.BaseBean;
 import com.ruiwenliu.wrapper.base.BaseStatusActivity;
+import com.ruiwenliu.wrapper.bean.BeanUserInfo;
 import com.ruiwenliu.wrapper.util.um.CustomShareListener;
 import com.ruiwenliu.wrapper.util.um.ShareManager;
 import com.ruiwenliu.wrapper.weight.TitleView;
@@ -313,7 +316,7 @@ public class CampDetailActivity extends BaseStatusActivity<CampPresenter> {
                                             && platform != SHARE_MEDIA.YNOTE
                                             && platform != SHARE_MEDIA.EVERNOTE) {
                                         showToast("分享成功啦");
-
+                                        sharingSuccess();
                                     }
                                 }
 
@@ -336,4 +339,44 @@ public class CampDetailActivity extends BaseStatusActivity<CampPresenter> {
         myClipboard.setPrimaryClip(myClip);
         showToast("复制成功！");
     }
+
+    /**
+     * 分享积分
+     */
+    private void sharingSuccess() {
+        if (!TextUtils.isEmpty(OkGoUtil.getToken())) {
+            BeanUserInfo.UserInfo userInfo = getUserInfo();
+            if (userInfo != null) {
+                Map<String, Object> headMap = new LinkedHashMap<>();
+                headMap.put("Content-type", "application/json;charset=UTF-8");
+                mPresenter.postBodyData(RvFrameConfig.HOST, 20, CommonApi.TOUR_SENDMESSAGE, BaseBean.class, new SharingSuccess("SHARE", userInfo.getUserid()), headMap, false);
+            }
+        }
+    }
+
+    private class SharingSuccess {
+        private String integralRuleCode;
+        private int userId;
+
+        public SharingSuccess(String integralRuleCode, int userId) {
+            this.integralRuleCode = integralRuleCode;
+            this.userId = userId;
+        }
+
+        public String getIntegralRuleCode() {
+            return integralRuleCode;
+        }
+
+        public void setIntegralRuleCode(String integralRuleCode) {
+            this.integralRuleCode = integralRuleCode;
+        }
+
+        public int getUserId() {
+            return userId;
+        }
+
+        public void setUserId(int userId) {
+            this.userId = userId;
+        }
+    }
 }

module_camp/src/main/res/layout/rv_item_camp_list.xml

@@ -36,7 +36,7 @@
         android:paddingRight="@dimen/size_5"
         android:text="休闲小镇房车露营168号营地"
         android:textColor="@color/colorMain"
-        android:textSize="@dimen/text_12" />
+        android:textSize="@dimen/text_14" />
 
     <TextView
         android:id="@+id/tv_city"

module_discovery/src/main/AndroidManifest.xml

@@ -13,14 +13,30 @@
     <uses-permission android:name="android.permission.WRITE_SETTINGS" />
 
     <application>
-        <activity android:name=".other.PatGeneratePosterActivity"></activity>
-        <activity android:name=".other.MapLocationActivity" />
-        <activity android:name=".other.CameraViewActivity" />
-        <activity android:name=".other.SendVideoActivity" />
-        <activity android:name=".other.DetailPatActivity" />
-        <activity android:name=".other.PostPatActivity" />
-        <activity android:name=".other.DetailQuestionAndAnswerActivity" />
-        <activity android:name=".other.PublishingProblemActivity" />
+        <activity
+            android:name=".other.PatGeneratePosterActivity"
+            android:screenOrientation="portrait" />
+        <activity
+            android:name=".other.MapLocationActivity"
+            android:screenOrientation="portrait" />
+        <activity
+            android:name=".other.CameraViewActivity"
+            android:screenOrientation="portrait" />
+        <activity
+            android:name=".other.SendVideoActivity"
+            android:screenOrientation="portrait" />
+        <activity
+            android:name=".other.DetailPatActivity"
+            android:screenOrientation="portrait" />
+        <activity
+            android:name=".other.PostPatActivity"
+            android:screenOrientation="portrait" />
+        <activity
+            android:name=".other.DetailQuestionAndAnswerActivity"
+            android:screenOrientation="portrait" />
+        <activity
+            android:name=".other.PublishingProblemActivity"
+            android:screenOrientation="portrait" />
     </application>
 
 </manifest>
\ No newline at end of file

module_discovery/src/main/java/com/xxfc/discovery/api/DiscoveryApi.java

@@ -3,8 +3,8 @@ package com.xxfc.discovery.api;
 import com.frame.rv.config.RvFrameConfig;
 
 public interface DiscoveryApi extends RvFrameConfig {
-//    String IMA_BASEUSRL = "https://imapi.dfangche.com";
-    String IMA_BASEUSRL = "https://xxfcim.upyuns.com/xxfcim";
+    String IMA_BASEUSRL = "https://imapi.dfangche.com";
+//    String IMA_BASEUSRL = "https://xxfcim.upyuns.com/xxfcim";
 
     //问题列表
     String DISCOVERY_IMQUESTION_LIST = HOST + "/api/im/imQuestion/list";

module_discovery/src/main/java/com/xxfc/discovery/fragment/RecommendFragment.java

@@ -108,16 +108,6 @@ public class RecommendFragment extends BaseFragment<DiscoveryPresenter> implemen
             }
         });
 
-        mRecommendAdapter.setOnItemChildClickListener(new BaseQuickAdapter.OnItemChildClickListener() {
-            @Override
-            public void onItemChildClick(BaseQuickAdapter adapter, View view, int position) {
-                int id = view.getId();
-                if (id == R.id.ll_item_islike){
-//                    showToast("222222");
-                }
-            }
-        });
-
         mRecommendAdapter.setOnLoadMoreListener(new BaseQuickAdapter.RequestLoadMoreListener() {
             @Override public void onLoadMoreRequested() {
                 if (rvContent != null) {
@@ -142,7 +132,7 @@ public class RecommendFragment extends BaseFragment<DiscoveryPresenter> implemen
                 itemDatabean = (DiscoveryRecommendBean.DataBeanX.DataBean) adapter.getItem(position);
                 int id = view.getId();
                 if (id == R.id.ll_item_islike){
-                    isLike();
+//                    isLike();
                 }
             }
         });

module_discovery/src/main/java/com/xxfc/discovery/other/DetailPatActivity.java

@@ -24,15 +24,18 @@ import android.widget.ProgressBar;
 import com.alibaba.android.arouter.facade.annotation.Autowired;
 import com.alibaba.android.arouter.facade.annotation.Route;
 import com.alibaba.android.arouter.launcher.ARouter;
+import com.alibaba.fastjson.JSON;
 import com.base.utils.tools.android.IntentUtil;
 import com.base.utils.ui.datetime.selector.util.TextUtil;
 import com.frame.base.url.Constance;
+import com.frame.rv.config.CommonApi;
 import com.frame.rv.config.RvFrameConfig;
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
 import com.ruiwenliu.wrapper.SPConstance;
 import com.ruiwenliu.wrapper.base.BaseBean;
 import com.ruiwenliu.wrapper.base.BaseStatusActivity;
+import com.ruiwenliu.wrapper.bean.BeanUserInfo;
 import com.ruiwenliu.wrapper.browse.ActivityImageBrowseUrl;
 import com.ruiwenliu.wrapper.util.um.CustomShareListener;
 import com.ruiwenliu.wrapper.util.um.ShareManager;
@@ -95,6 +98,7 @@ public class DetailPatActivity extends BaseStatusActivity<DiscoveryPresenter> {
 
     private ShareManager shareManager;
     private ClipboardManager myClipboard;
+    private  String code;
 
     @Override
     protected int setLayout() {
@@ -119,7 +123,7 @@ public class DetailPatActivity extends BaseStatusActivity<DiscoveryPresenter> {
         initWeb();
 
         if (!TextUtils.isEmpty(title) && !TextUtils.isEmpty(iconUrl)) {
-            String code = Cookie.getStringValue(getApplicationContext(), SPConstance.USER_JSON_CODE, "");
+            code = Cookie.getStringValue(getApplicationContext(), SPConstance.USER_JSON_CODE, "");
             initShare(webUrl + "&shareType=app&code=" + code, title, "【滴房车】开着房车去旅行，一样的旅途，不一样的精彩", iconUrl);
         }
 
@@ -309,7 +313,7 @@ public class DetailPatActivity extends BaseStatusActivity<DiscoveryPresenter> {
                             .build(Constance.ACTIVITY_URL_PATGENERATEPOSTER)
                             .withString("iconUrl", iconUrl)
                             .withString("content", title)
-                            .withString("url", webUrl + "&shareType=app")
+                            .withString("url", webUrl + "&shareType=app&code=" + code)
                             .withString("userName", userName)
                             .withString("userUrl", userUrl)
                             .navigation();
@@ -342,7 +346,7 @@ public class DetailPatActivity extends BaseStatusActivity<DiscoveryPresenter> {
                                             && platform != SHARE_MEDIA.YNOTE
                                             && platform != SHARE_MEDIA.EVERNOTE) {
                                         showToast("分享成功啦");
-
+                                        sharingSuccess();
                                     }
 
                                 }
@@ -403,4 +407,44 @@ public class DetailPatActivity extends BaseStatusActivity<DiscoveryPresenter> {
 //        mWebView.addJavascriptInterface(new AndroidJs(),"AndroidJs");
         mWebView.destroy();// 生命周期销毁
     }
+
+    /**
+     * 分享积分
+     */
+    private void sharingSuccess() {
+        if (!TextUtils.isEmpty(OkGoUtil.getToken())) {
+            BeanUserInfo.UserInfo userInfo = getUserInfo();
+            if (userInfo != null) {
+                Map<String, Object> headMap = new LinkedHashMap<>();
+                headMap.put("Content-type", "application/json;charset=UTF-8");
+                mPresenter.postBodyData(RvFrameConfig.HOST, 20, CommonApi.TOUR_SENDMESSAGE, BaseBean.class, new SharingSuccess("SHARE", userInfo.getUserid()), headMap, false);
+            }
+        }
+    }
+
+    private class SharingSuccess {
+        private String integralRuleCode;
+        private int userId;
+
+        public SharingSuccess(String integralRuleCode, int userId) {
+            this.integralRuleCode = integralRuleCode;
+            this.userId = userId;
+        }
+
+        public String getIntegralRuleCode() {
+            return integralRuleCode;
+        }
+
+        public void setIntegralRuleCode(String integralRuleCode) {
+            this.integralRuleCode = integralRuleCode;
+        }
+
+        public int getUserId() {
+            return userId;
+        }
+
+        public void setUserId(int userId) {
+            this.userId = userId;
+        }
+    }
 }

module_home/src/main/AndroidManifest.xml

@@ -3,10 +3,18 @@
     package="com.rv.home">
 
     <application>
-        <activity android:name=".rv.module.ui.main.home.order.DepositefundProgressDetailsActivity"></activity>
-        <activity android:name=".rv.module.ui.main.home.other.SelectItemActivity" />
-        <activity android:name=".rv.module.ui.main.home.order.MemberOrderDetailsActivity" />
-        <activity android:name=".rv.module.ui.main.home.SalesroomActivity" />
+        <activity
+            android:name=".rv.module.ui.main.home.order.DepositefundProgressDetailsActivity"
+            android:screenOrientation="portrait" />
+        <activity
+            android:name=".rv.module.ui.main.home.other.SelectItemActivity"
+            android:screenOrientation="portrait" />
+        <activity
+            android:name=".rv.module.ui.main.home.order.MemberOrderDetailsActivity"
+            android:screenOrientation="portrait" />
+        <activity
+            android:name=".rv.module.ui.main.home.SalesroomActivity"
+            android:screenOrientation="portrait" />
     </application>
 
 </manifest>
\ No newline at end of file

module_home/src/main/java/com/rv/home/rv/module/basic/BaseStatusActivity.java

@@ -57,7 +57,7 @@ public abstract class BaseStatusActivity<P extends MvpPresenter> extends SwipeBa
         switch (errorType){
             case 40301:
                 RvFrameConfig.RvFrameInfo.TYPE_LOGIN = 0;
-                startActivity(LoginRvActivity.getIntent(mActivity));
+                startActivity(LoginRvActivity.getIntent(mActivity,0));
                 break;
         }
 

module_home/src/main/java/com/rv/home/rv/module/ui/login/LoginRvActivity.java

@@ -75,8 +75,11 @@ public class LoginRvActivity extends BaseLoginActivity<CommonPresenter> {
     private int mLoginType;
     private String mName;
 
-    public static Intent getIntent(Context context) {
-        return new Intent(context, LoginRvActivity.class);
+    private int jumptype;
+
+    public static Intent getIntent(Context context, int jumptype) {
+        return new Intent(context, LoginRvActivity.class)
+                .putExtra("jumptype", jumptype);
     }
 
     @Override
@@ -89,6 +92,7 @@ public class LoginRvActivity extends BaseLoginActivity<CommonPresenter> {
         titleView.setTitle(getString(R.string.rv_phone_login));
         editListener(etPhone);
         editListener(etPhoneCode);
+        jumptype = intent.getIntExtra("jumptype", 0);
 //        etPhone.setText(""+mActivity.getPackageName());
         initRxbus();
         ShareInstall.getInstance().getInfo(getIntent(), new AppGetInfoListener() {
@@ -162,9 +166,9 @@ public class LoginRvActivity extends BaseLoginActivity<CommonPresenter> {
         } else if (view.getId() == R.id.iv_qq) {
             umLogin(SHARE_MEDIA.QQ);
         } else if (view.getId() == R.id.tv_pwd_login) {
-            startActivity(PwdLoginActivity.getIntent(mActivity));
+            startActivity(PwdLoginActivity.getIntent(mActivity, jumptype));
         } else if (view.getId() == R.id.tv_registered) {
-            startActivity(RegisteredActivity.getIntent(mActivity, 0));
+            startActivity(RegisteredActivity.getIntent(mActivity, 0, jumptype));
         } else if (view.getId() == R.id.iv_clear_phone) {
             clearEditData(etPhone);
         } else if (view.getId() == R.id.iv_clear_code) {

module_home/src/main/java/com/rv/home/rv/module/ui/login/PwdLoginActivity.java

@@ -45,15 +45,18 @@ public class PwdLoginActivity extends BaseLoginActivity<CommonPresenter> {
     TextView tvLogin;
 
     private boolean isShow;
+    private int jumptype;
 
-    public static Intent getIntent(Context context) {
-        return new Intent(context, PwdLoginActivity.class);
+    public static Intent getIntent(Context context,int jumptype) {
+        return new Intent(context, PwdLoginActivity.class)
+                .putExtra("jumptype",jumptype);
     }
 
     @Override
     protected void initView(Bundle savedInstanceState, TitleView titleView, Intent intent) {
         super.initView(savedInstanceState, titleView, intent);
         titleView.setTitle(mActivity.getString(R.string.rv_pwd_login));
+        jumptype = intent.getIntExtra("jumptype",0);
         editListener(etPhone);
         editListener(etPwd);
     }
@@ -95,14 +98,14 @@ public class PwdLoginActivity extends BaseLoginActivity<CommonPresenter> {
         }else  if(view.getId()==R.id.tv_phone_login){
             finish();
         }else  if(view.getId()==R.id.tv_registered){
-            startActivity(RegisteredActivity.getIntent(mActivity, 0));
+            startActivity(RegisteredActivity.getIntent(mActivity, 0,jumptype));
             finish();
         }else  if(view.getId()==R.id.iv_weixin){
             umLogin(SHARE_MEDIA.WEIXIN);
         }else  if(view.getId()==R.id.iv_qq){
             umLogin(SHARE_MEDIA.QQ);
         }else  if(view.getId()==R.id.tv_forget_pwd){
-            startActivity(RegisteredActivity.getIntent(mActivity, 1));
+            startActivity(RegisteredActivity.getIntent(mActivity, 1,0));
             finish();
         }
 

module_home/src/main/java/com/rv/home/rv/module/ui/login/RegisteredActivity.java

@@ -71,9 +71,12 @@ public class RegisteredActivity extends BaseLoginActivity<CommonPresenter> {
     private boolean pwdShow;//密码
     private boolean confirmShow;//确认密码
     private int mType;
+    private int jumptype;
 
-    public static Intent getIntent(Context context, int type) {
-        return new Intent(context, RegisteredActivity.class).putExtra("type", type);
+    public static Intent getIntent(Context context, int type, int jumptype) {
+        return new Intent(context, RegisteredActivity.class)
+                .putExtra("type", type)
+                .putExtra("jumptype", jumptype);
     }
 
     @Override
@@ -89,6 +92,7 @@ public class RegisteredActivity extends BaseLoginActivity<CommonPresenter> {
     @Override
     protected void initView(Bundle savedInstanceState, TitleView titleView, Intent intent) {
         mType = intent.getIntExtra("type", 0);
+        jumptype = intent.getIntExtra("jumptype", 0);
         titleView.setTitle(mActivity.getString(mType == 0 ? R.string.rv_phone_registered : R.string.rv_forget_pwd));
         tvRegistered.setText(mActivity.getString(mType == 0 ? R.string.rv_registered : R.string.rv_reset_pwd));
         cbAnnotations.setVisibility(mType == 0 ? View.VISIBLE : View.GONE);
@@ -107,6 +111,9 @@ public class RegisteredActivity extends BaseLoginActivity<CommonPresenter> {
                 break;
             case 1:
                 processLoginData((RegisteredBean) result);
+                if (jumptype == 1) {
+                    mPresenter.saveOnclick("4", "");
+                }
                 break;
             case 10:
                 setDataUser((BeanUserInfo) result);

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

@@ -29,6 +29,7 @@ import com.frame.base.bus.PaymentFailedEvent;
 import com.frame.base.bus.PaymentSuccessfulEvent;
 import com.frame.base.bus.RxBus;
 import com.frame.base.url.Constance;
+import com.frame.rv.config.CommonApi;
 import com.frame.rv.config.RvFrameConfig;
 import com.ruiwenliu.wrapper.SPConstance;
 import com.ruiwenliu.wrapper.base.BaseBean;
@@ -258,7 +259,7 @@ public class CarDetailActivity extends BaseStatusActivity<CommonPresenter> {
         } else if (view.getId() == R.id.tv_appointment) {
             if (TextUtils.isEmpty(OkGoUtil.getToken())) {
                 RvFrameConfig.RvFrameInfo.TYPE_LOGIN = 1;
-                startActivity(LoginRvActivity.getIntent(mActivity));
+                startActivity(LoginRvActivity.getIntent(mActivity, 0));
                 return;
             }
             BeanUserInfo.UserInfo userInfo = getUserInfo();
@@ -351,7 +352,6 @@ public class CarDetailActivity extends BaseStatusActivity<CommonPresenter> {
         shareManager = new ShareManager(this, new ShareBoardlistener() {
             @Override
             public void onclick(SnsPlatform snsPlatform, SHARE_MEDIA share_media) {
-
                 if (snsPlatform.mShowWord.equals("生成海报")) {
                     String icon = "";
                     if (TextUtils.isEmpty(mCarBean.getVehicleModel().getPosterBackground())) {
@@ -361,9 +361,12 @@ public class CarDetailActivity extends BaseStatusActivity<CommonPresenter> {
                     }
 
                     ARouter.getInstance()
-                            .build(Constance.ACTIVITY_URL_POSTERACTIVITY)
+                            .build(Constance.ACTIVITY_URL_CARPOSTERACTIVITY)
                             .withString("url", url)
                             .withString("imageUrl", icon)
+                            .withString("title",mCarBean.getVehicleModel().getName())
+                            .withString("content",mCarBean.getVehicleModel().getKeyword())
+                            .withString("price",String.valueOf(mCarBean.getVehicleModel().getPrice()))
                             .navigation();
 
                 } else if (snsPlatform.mShowWord.equals("复制链接")) {
@@ -394,7 +397,7 @@ public class CarDetailActivity extends BaseStatusActivity<CommonPresenter> {
                                             && platform != SHARE_MEDIA.YNOTE
                                             && platform != SHARE_MEDIA.EVERNOTE) {
                                         showToast("分享成功啦");
-
+                                        sharingSuccess();
                                     }
 
                                 }
@@ -463,4 +466,45 @@ public class CarDetailActivity extends BaseStatusActivity<CommonPresenter> {
     }
 
 
+    /**
+     * 分享积分
+     */
+    private void sharingSuccess() {
+        if (!TextUtils.isEmpty(OkGoUtil.getToken())) {
+            BeanUserInfo.UserInfo userInfo = getUserInfo();
+            if (userInfo != null) {
+                Map<String, Object> headMap = new LinkedHashMap<>();
+                headMap.put("Content-type", "application/json;charset=UTF-8");
+                mPresenter.postBodyData(RvFrameConfig.HOST, 20, CommonApi.TOUR_SENDMESSAGE, BaseBean.class, new SharingSuccess("SHARE", userInfo.getUserid()), headMap, false);
+            }
+        }
+    }
+
+
+    private class SharingSuccess {
+        private String integralRuleCode;
+        private int userId;
+
+        public SharingSuccess(String integralRuleCode, int userId) {
+            this.integralRuleCode = integralRuleCode;
+            this.userId = userId;
+        }
+
+        public String getIntegralRuleCode() {
+            return integralRuleCode;
+        }
+
+        public void setIntegralRuleCode(String integralRuleCode) {
+            this.integralRuleCode = integralRuleCode;
+        }
+
+        public int getUserId() {
+            return userId;
+        }
+
+        public void setUserId(int userId) {
+            this.userId = userId;
+        }
+    }
+
 }

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

@@ -272,9 +272,9 @@ public class CarRentalListActivity extends BaseStatusActivity<CommonPresenter> i
         map.put("limit", 10);
         map.put("lat", mLat);
         map.put("lon", mLon);
-//        map.put("parkBranchCompanyId", dataBean.getStartCompanyId());
-        map.put("startCompanyId",dataBean.getStartCompanyId());
-        map.put("endCompanyId",dataBean.getEndCompanyId());
+        map.put("parkBranchCompanyId", dataBean.getStartCompanyId());
+//        map.put("startCompanyId",dataBean.getStartCompanyId());
+//        map.put("endCompanyId",dataBean.getEndCompanyId());
         try {
             map.put("startDateTamp", TimeManager.dateToStamp(begDate));
             map.put("endDateTamp", TimeManager.dateToStamp(endDate));

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

@@ -1177,7 +1177,9 @@ public class HomeFragment extends BaseFragment<HomePresenter> implements Observa
                 for (ListsBean lsBean : cityBean.getLists()) {
                     if (!TextUtils.isEmpty(starCity) && starCity.equals(lsBean.getName())) {
                         dataBean.setStartCity(lsBean.getId());
-                    } else if (!TextUtils.isEmpty(endCity) && endCity.equals(lsBean.getName())) {
+                    }
+
+                    if (!TextUtils.isEmpty(endCity) && endCity.equals(lsBean.getName())) {
                         dataBean.setEndCity(lsBean.getId());
                     }
                 }

module_mine/src/main/java/com/rv/rvmine/MineFragment.java

@@ -265,7 +265,7 @@ public class MineFragment extends BaseFragment<CommonPresenter> implements Simpl
 
         } else if (id == R.id.tv_login) {
             //登录
-            startActivity(LoginRvActivity.getIntent(_mActivity));
+            startActivity(LoginRvActivity.getIntent(_mActivity,0));
 
         } else if (id == R.id.tv_verified) {
             //实名认证
@@ -472,7 +472,7 @@ public class MineFragment extends BaseFragment<CommonPresenter> implements Simpl
     private boolean isLogin() {
         String token = OkGoUtil.getToken();
         if (TextUtils.isEmpty(token)) {
-            startActivity(LoginRvActivity.getIntent(_mActivity));
+            startActivity(LoginRvActivity.getIntent(_mActivity,0));
             return true;
         }
         return false;

module_mine/src/main/java/com/rv/rvmine/traveler/PersonalInformationActivity.java

@@ -192,6 +192,8 @@ public class PersonalInformationActivity extends BaseStatusActivity<PickerPresen
             String url = mPresenter.gerCameraStoreUrl();
             GlideManager.getInstance(mActivity).loadImage(url, ivAvatar);
             uploadFile(new File(mPresenter.gerCameraStoreUrl()), "camera");
+        }else {
+            UMShareAPI.get(mActivity).onActivityResult(requestCode, resultCode, data);
         }
 
     }

module_mine/src/main/java/com/rv/rvmine/traveler/SettingActivity.java

@@ -96,7 +96,7 @@ public class SettingActivity extends BaseStatusActivity<CommonPresenter> {
         int id = view.getId();
         if (id == R.id.rl_item_change_password) {
             //修改密码
-            startActivity(RegisteredActivity.getIntent(mActivity, 1));
+            startActivity(RegisteredActivity.getIntent(mActivity, 1,0));
 
         } else if (id == R.id.ll_item_app_push) {
             //App推送消息

module_mine/src/main/res/layout/activity_mine.xml

@@ -269,7 +269,7 @@
                                 android:clickable="false"
                                 android:gravity="center"
                                 android:orientation="vertical"
-                                android:visibility="visible">
+                                android:visibility="gone">
 
                                 <ImageView
                                     android:layout_width="@dimen/size_25"

module_tourism/src/main/AndroidManifest.xml

@@ -3,13 +3,17 @@
     package="com.rv.tourism">
 
     <application>
-        <activity android:name=".other.TravelerConfirmOrderActivity">
-        </activity>
+        <activity
+            android:name=".other.TravelerConfirmOrderActivity"
+            android:screenOrientation="portrait" />
         <activity
             android:name=".other.TravelDetailsActivity"
             android:label="@string/title_activity_travel_details"
+            android:screenOrientation="portrait"
             android:theme="@style/AppTheme.NoActionBar" />
-        <activity android:name=".other.PopularTourListActivity" />
+        <activity
+            android:name=".other.PopularTourListActivity"
+            android:screenOrientation="portrait" />
     </application>
 
 </manifest>
\ No newline at end of file

module_tourism/src/main/java/com/rv/tourism/other/TravelDetailsActivity.java

@@ -25,6 +25,7 @@ import android.widget.TextView;
 import com.alibaba.android.arouter.facade.annotation.Autowired;
 import com.alibaba.android.arouter.facade.annotation.Route;
 import com.alibaba.android.arouter.launcher.ARouter;
+import com.alibaba.fastjson.JSON;
 import com.base.utils.ui.datetime.selector.util.TextUtil;
 import com.frame.base.bus.IDCardCertificationEvent;
 import com.frame.base.bus.Observer;
@@ -374,7 +375,7 @@ public class TravelDetailsActivity extends BaseStatusActivity<TourismPresenter>
         shareManager = new ShareManager(this, new ShareBoardlistener() {
             @Override
             public void onclick(SnsPlatform snsPlatform, SHARE_MEDIA share_media) {
-
+                sharingSuccess();
                 if (snsPlatform.mShowWord.equals("生成海报")) {
                     String icon = "";
                     if (TextUtils.isEmpty(posterBackground)) {
@@ -417,7 +418,6 @@ public class TravelDetailsActivity extends BaseStatusActivity<TourismPresenter>
                                             && platform != SHARE_MEDIA.YNOTE
                                             && platform != SHARE_MEDIA.EVERNOTE) {
                                         showToast("分享成功啦");
-
                                     }
                                 }
 
@@ -628,17 +628,42 @@ public class TravelDetailsActivity extends BaseStatusActivity<TourismPresenter>
     /**
      * 分享积分
      */
-    private void sharingSuccess(){
-//        mPresenter.postBodyData(RvFrameConfig.HOST,0, CommonApi.TOUR_SENDMESSAGE, new Sharing("",""),false);
+    private void sharingSuccess() {
+        if (!TextUtils.isEmpty(OkGoUtil.getToken())) {
+            BeanUserInfo.UserInfo userInfo = getUserInfo();
+            if (userInfo != null) {
+                Map<String, Object> headMap = new LinkedHashMap<>();
+                headMap.put("Content-type", "application/json;charset=UTF-8");
+                mPresenter.postBodyData(RvFrameConfig.HOST, 20, CommonApi.TOUR_SENDMESSAGE, BaseBean.class, new SharingSuccess("SHARE", userInfo.getUserid()), headMap, false);
+            }
+        }
     }
 
-    private class Sharing {
-      private String integralRuleCode;
-      private String userId;
+    private class SharingSuccess {
+        private String integralRuleCode;
+        private int userId;
+
+        public SharingSuccess(String integralRuleCode, int userId) {
+            this.integralRuleCode = integralRuleCode;
+            this.userId = userId;
+        }
+
+        public String getIntegralRuleCode() {
+            return integralRuleCode;
+        }
 
-        public Sharing(String integralRuleCode, String userId) {
+        public void setIntegralRuleCode(String integralRuleCode) {
             this.integralRuleCode = integralRuleCode;
+        }
+
+        public int getUserId() {
+            return userId;
+        }
+
+        public void setUserId(int userId) {
             this.userId = userId;
         }
     }
+
+
 }

plugin_calendar/src/main/AndroidManifest.xml

@@ -2,7 +2,9 @@
     package="com.rv.plugin.calendar">
 
     <application>
-        <activity android:name=".CalendarActivity"></activity>
+        <activity
+            android:name=".CalendarActivity"
+            android:screenOrientation="portrait" />
     </application>
 
 </manifest>

plugin_carpurchase/src/main/AndroidManifest.xml

@@ -3,9 +3,15 @@
     package="com.xxrv.carpurchase">
 
     <application>
-        <activity android:name=".activity.ReservationInformationActivity"></activity>
-        <activity android:name=".activity.CarPurchaseListActivity" />
-        <activity android:name=".activity.DetailCarPurchaseActivity" />
+        <activity
+            android:name=".activity.ReservationInformationActivity"
+            android:screenOrientation="portrait" />
+        <activity
+            android:name=".activity.CarPurchaseListActivity"
+            android:screenOrientation="portrait" />
+        <activity
+            android:name=".activity.DetailCarPurchaseActivity"
+            android:screenOrientation="portrait" />
     </application>
 
 </manifest>
\ No newline at end of file

plugin_coupon/src/main/AndroidManifest.xml

@@ -3,8 +3,12 @@
     package="com.xxrv.coupon">
 
     <application>
-        <activity android:name=".CarCouponActivity"></activity>
-        <activity android:name=".CouponAllActivity" />
+        <activity
+            android:name=".CarCouponActivity"
+            android:screenOrientation="portrait" />
+        <activity
+            android:name=".CouponAllActivity"
+            android:screenOrientation="portrait" />
     </application>
 
 </manifest>
\ No newline at end of file

plugin_imcamera/src/main/AndroidManifest.xml

@@ -2,18 +2,24 @@
     package="com.xxfc.imcamera">
 
     <application>
-        <activity android:name=".activity.EasyCameraActivity"></activity>
-        <activity android:name=".photopicker.PhotoPreviewActivity"></activity>
-        <activity android:name=".photopicker.PhotoPickerActivity"></activity>
+        <activity
+            android:name=".activity.EasyCameraActivity"
+            android:screenOrientation="portrait" />
+        <activity
+            android:name=".photopicker.PhotoPreviewActivity"
+            android:screenOrientation="portrait" />
+        <activity
+            android:name=".photopicker.PhotoPickerActivity"
+            android:screenOrientation="portrait" />
 
         <!--<provider-->
-            <!--android:name="android.support.v4.content.FileProvider"-->
-            <!--android:authorities="${APP_ID}.fileProvider"-->
-            <!--android:exported="false"-->
-            <!--android:grantUriPermissions="true">-->
-            <!--<meta-data-->
-                <!--android:name="android.support.FILE_PROVIDER_PATHS"-->
-                <!--android:resource="@xml/file_paths" />-->
+        <!--android:name="android.support.v4.content.FileProvider"-->
+        <!--android:authorities="${APP_ID}.fileProvider"-->
+        <!--android:exported="false"-->
+        <!--android:grantUriPermissions="true">-->
+        <!--<meta-data-->
+        <!--android:name="android.support.FILE_PROVIDER_PATHS"-->
+        <!--android:resource="@xml/file_paths" />-->
         <!--</provider>-->
     </application>
 

plugin_member/src/main/AndroidManifest.xml

@@ -3,10 +3,18 @@
     package="com.rv.member">
 
     <application>
-        <activity android:name=".MemberCenterActivity" />
-        <activity android:name=".ConsumeRecordActivity" />
-        <activity android:name=".FreesDayActivity" />
-        <activity android:name=".PurchaseRecordActivity"></activity>
+        <activity
+            android:name=".MemberCenterActivity"
+            android:screenOrientation="portrait" />
+        <activity
+            android:name=".ConsumeRecordActivity"
+            android:screenOrientation="portrait" />
+        <activity
+            android:name=".FreesDayActivity"
+            android:screenOrientation="portrait" />
+        <activity
+            android:name=".PurchaseRecordActivity"
+            android:screenOrientation="portrait" />
     </application>
 
 </manifest>
\ No newline at end of file

plugin_member/src/main/java/com/rv.member/MemberCenterActivity.java

@@ -238,7 +238,7 @@ public class MemberCenterActivity extends BaseStatusActivity<MemberPresenter> {
      */
     private boolean isLogin() {
         if (TextUtils.isEmpty(OkGoUtil.getToken())) {
-            startActivityForResult(LoginRvActivity.getIntent(MemberCenterActivity.this), REQUEST_LOGIN);
+            startActivityForResult(LoginRvActivity.getIntent(MemberCenterActivity.this,0), REQUEST_LOGIN);
             return false;
         }
         return true;

plugin_points/src/main/AndroidManifest.xml

@@ -3,8 +3,12 @@
     package="com.rv.points">
 
     <application>
-        <activity android:name=".PointsActivity" />
-        <activity android:name=".SignActivity"></activity>
+        <activity
+            android:name=".PointsActivity"
+            android:screenOrientation="portrait" />
+        <activity
+            android:name=".SignActivity"
+            android:screenOrientation="portrait" />
     </application>
 
 </manifest>
\ No newline at end of file

plugin_poster/src/main/AndroidManifest.xml

@@ -2,6 +2,11 @@
     package="com.rv.poster.plugin">
 
     <application>
-        <activity android:name=".PosterActivity"></activity>
+        <activity
+            android:name=".PosterActivity"
+            android:screenOrientation="portrait" />
+        <activity
+            android:name=".CarPosterActivity"
+            android:screenOrientation="portrait" />
     </application>
 </manifest>
\ No newline at end of file

plugin_poster/src/main/java/com/rv/poster/plugin/CarPosterActivity.java

+package com.rv.poster.plugin;
+
+import android.Manifest;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.content.res.Configuration;
+import android.graphics.Bitmap;
+import android.os.Build;
+import android.os.Bundle;
+import android.support.annotation.NonNull;
+import android.support.v4.app.ActivityCompat;
+import android.support.v4.content.ContextCompat;
+import android.support.v7.widget.CardView;
+import android.text.TextUtils;
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import com.alibaba.android.arouter.facade.annotation.Autowired;
+import com.alibaba.android.arouter.facade.annotation.Route;
+import com.base.utils.ui.datetime.selector.util.TextUtil;
+import com.bumptech.glide.Glide;
+import com.bumptech.glide.load.resource.bitmap.RoundedCorners;
+import com.bumptech.glide.request.RequestOptions;
+import com.frame.base.url.Constance;
+import com.ruiwenliu.wrapper.base.BaseBean;
+import com.ruiwenliu.wrapper.base.BaseStatusActivity;
+import com.ruiwenliu.wrapper.base.presenter.CommonPresenter;
+import com.ruiwenliu.wrapper.util.TransformationUtil;
+import com.ruiwenliu.wrapper.util.glide.GlideOptions;
+import com.ruiwenliu.wrapper.util.um.CustomShareListener;
+import com.ruiwenliu.wrapper.util.um.ShareManager;
+import com.ruiwenliu.wrapper.weight.TitleView;
+import com.rv.component.utils.DisplayUtil;
+import com.rv.component.utils.ShareUtils;
+import com.rv.component.utils.ZxingUtils;
+import com.umeng.socialize.bean.SHARE_MEDIA;
+import com.umeng.socialize.media.UMImage;
+import com.umeng.socialize.shareboard.SnsPlatform;
+import com.umeng.socialize.utils.ShareBoardlistener;
+
+import java.io.File;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import butterknife.OnClick;
+
+/**
+ * 租车海报分享
+ */
+@Route(path = Constance.ACTIVITY_URL_CARPOSTERACTIVITY)
+public class CarPosterActivity extends BaseStatusActivity<CommonPresenter> {
+
+    @BindView(R2.id.img_bill_top)
+    ImageView imgBillTop;
+    @BindView(R2.id.img_qrcode)
+    ImageView imgQrcode;
+    @BindView(R2.id.ll_bill_content)
+    CardView llBillContent;
+    @BindView(R2.id.tv_name)
+    TextView tvName;
+    @BindView(R2.id.tv_content)
+    TextView tvContent;
+    @BindView(R2.id.tv_price)
+    TextView tvPrice;
+
+    @Autowired()
+    String title;
+
+    @Autowired()
+    String content;
+
+    @Autowired()
+    String price;
+
+    @Autowired()
+    String url;
+
+    @Autowired()
+    String imageUrl;
+
+
+    private ShareManager shareManager;
+    private Bitmap bitmap = null;
+    private UMImage image = null;
+
+    @Override
+    protected int setLayout() {
+        return R.layout.activity_carposter;
+    }
+
+    @Override
+    protected void initView(Bundle savedInstanceState, TitleView titleView, Intent intent) {
+        titleView.setTitle("生成海报");
+
+        if (!TextUtils.isEmpty(url)) {
+            Bitmap bitmap = ZxingUtils.createQR(url, DisplayUtil.dip2px(this, 150), DisplayUtil.dip2px(this, 150));
+            imgQrcode.setImageBitmap(bitmap);
+        }
+
+        GlideOptions options = GlideOptions.placeholderOf(com.ruiwenliu.wrapper.R.drawable.glide_icon_placeholder).
+                error(com.ruiwenliu.wrapper.R.drawable.glide_icon_error);
+        TransformationUtil utils = new TransformationUtil(imgBillTop);
+        Glide.with(this)
+                .asBitmap()
+                .load(imageUrl)
+                .apply(options)
+                .apply(RequestOptions
+                        .bitmapTransform(new RoundedCorners(12)).override(imgBillTop.getWidth(), imgBillTop.getHeight())
+                        .disallowHardwareConfig())
+                .into(utils);
+
+
+        tvName.setText(title);
+        tvContent.setText(content);
+        tvPrice.setText("¥" + price + "/天");
+
+    }
+
+    @Override
+    public void onShowResult(int requestType, BaseBean result) {
+
+    }
+
+
+    @OnClick({R2.id.tv_item_save_bill, R2.id.tv_item_share})
+    public void onViewClicked(View view) {
+        int id = view.getId();
+        if (id == R.id.tv_item_save_bill) {
+            preShare(0, 1001);
+        } else if (id == R.id.tv_item_share) {
+            preShare(1, 1002);
+        }
+    }
+
+
+    /**
+     * 预备下载 进行 6.0权限检查
+     */
+    private void preShare(int type, int requestCode) {
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
+            if (type == 0) {
+                saveBill(llBillContent);
+            } else {
+                share(llBillContent);
+            }
+        } else {
+            if (ContextCompat.checkSelfPermission(this,
+                    Manifest.permission.WRITE_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED) {
+                if (type == 0) {
+                    saveBill(llBillContent);
+                } else {
+                    share(llBillContent);
+                }
+            } else {//申请权限
+                ActivityCompat.requestPermissions(this,
+                        new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE}, requestCode);
+            }
+        }
+    }
+
+
+    @Override
+    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
+        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
+        switch (requestCode) {
+            case 1001:
+                if (grantResults[0] == PackageManager.PERMISSION_GRANTED) {
+                    saveBill(llBillContent);
+                } else {
+                    showToast("授权失败,无法分享海报");
+                }
+                break;
+            case 1002:
+                if (grantResults[0] == PackageManager.PERMISSION_GRANTED) {
+                    share(llBillContent);
+                } else {
+                    showToast("授权失败,无法分享海报");
+                }
+                break;
+        }
+    }
+
+    /**
+     * 屏幕横竖屏切换时避免出现window leak的问题
+     */
+    @Override
+    public void onConfigurationChanged(Configuration newConfig) {
+        super.onConfigurationChanged(newConfig);
+        shareManager.close();
+    }
+
+
+    /******
+     * 分享
+     */
+    public void share(View view) {
+        if (shareManager == null) {
+
+            if (view != null && bitmap == null) {
+                bitmap = ShareUtils.viewConversionBitmap(view);
+            }
+            File file = null;
+            if (bitmap != null) {
+                file = ShareUtils.saveBitmapFile(mActivity, bitmap);
+            }
+            if (file != null) {
+                image = new UMImage(mActivity, file);//bitmap文件
+                image.compressStyle = UMImage.CompressStyle.SCALE;//大小压缩，默认为大小压缩，适合普通很大的图
+                image.compressStyle = UMImage.CompressStyle.QUALITY;//质量压缩，适合长图的分享
+                image.compressFormat = Bitmap.CompressFormat.PNG;
+            }
+
+            shareManager = new ShareManager(this, new ShareBoardlistener() {
+                @Override
+                public void onclick(SnsPlatform snsPlatform, SHARE_MEDIA share_media) {
+
+                    shareManager.showShareImage2(share_media, image, new CustomShareListener(mActivity) {
+                        @Override
+                        public void onResult(SHARE_MEDIA platform) {
+                            super.onResult(platform);
+
+                            if (platform.name().equals("WEIXIN_FAVORITE")) {
+
+                                showToast(platform + " 收藏成功啦");
+
+                            } else {
+                                if (platform != SHARE_MEDIA.MORE && platform != SHARE_MEDIA.SMS
+                                        && platform != SHARE_MEDIA.EMAIL
+                                        && platform != SHARE_MEDIA.FLICKR
+                                        && platform != SHARE_MEDIA.FOURSQUARE
+                                        && platform != SHARE_MEDIA.TUMBLR
+                                        && platform != SHARE_MEDIA.POCKET
+                                        && platform != SHARE_MEDIA.PINTEREST
+
+                                        && platform != SHARE_MEDIA.INSTAGRAM
+                                        && platform != SHARE_MEDIA.GOOGLEPLUS
+                                        && platform != SHARE_MEDIA.YNOTE
+                                        && platform != SHARE_MEDIA.EVERNOTE) {
+                                    showToast(platform + "分享成功啦");
+
+                                }
+                            }
+
+                        }
+                    });
+                }
+            });
+        }
+        shareManager.open();
+    }
+
+
+    /*****
+     * 保存海报
+     * @param view
+     */
+    public void saveBill(View view) {
+        if (view != null) {
+            Bitmap bitmap = ShareUtils.viewConversionBitmap(view);
+            File file = null;
+            if (bitmap != null) {
+                file = ShareUtils.saveBitmapFile(mActivity, bitmap);
+            }
+            if (file != null) {
+                showToast("海报保存在" + file.getAbsolutePath());
+            }
+        }
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        // TODO: add setContentView(...) invocation
+        ButterKnife.bind(this);
+    }
+}

plugin_poster/src/main/res/layout/activity_carposter.xml

+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/colorWrite"
+    android:orientation="vertical">
+
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="#F9D993">
+
+        <android.support.v7.widget.CardView
+            android:id="@+id/ll_bill_content"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="top"
+            android:layout_marginLeft="@dimen/size_15"
+            android:layout_marginTop="@dimen/size_15"
+            android:layout_marginRight="@dimen/size_15"
+            android:layout_marginBottom="@dimen/size_70"
+            android:background="@color/white"
+            app:cardCornerRadius="5dp">
+
+            <ScrollView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="@dimen/size_10"
+                android:layout_marginTop="@dimen/size_10"
+                android:layout_marginRight="@dimen/size_10"
+                android:layout_marginBottom="@dimen/size_5"
+                android:scrollbars="none">
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:gravity="center_horizontal"
+                    android:orientation="vertical">
+
+                    <ImageView
+                        android:id="@+id/img_bill_top"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content" />
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="@dimen/dp_10"
+                        android:gravity="center_vertical"
+                        android:orientation="horizontal">
+
+                        <LinearLayout
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_marginLeft="@dimen/size_5"
+                            android:layout_weight="1"
+                            android:orientation="vertical">
+
+                            <TextView
+                                android:id="@+id/tv_name"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:maxLines="1"
+                                android:singleLine="true"
+                                android:textColor="@color/colorMain"
+                                android:textSize="@dimen/text_16" />
+
+                            <TextView
+                                android:id="@+id/tv_content"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_marginTop="@dimen/size_3"
+                                android:maxLines="1"
+                                android:singleLine="true"
+                                android:textColor="@color/textGray"
+                                android:textSize="@dimen/text_10" />
+
+                            <TextView
+                                android:id="@+id/tv_price"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_marginTop="@dimen/size_3"
+                                android:singleLine="true"
+                                android:textColor="@color/colorAuxiliaryRed"
+                                android:textSize="@dimen/text_14" />
+
+                        </LinearLayout>
+
+                        <LinearLayout
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="right"
+                            android:layout_marginLeft="@dimen/text_10"
+                            android:gravity="center_vertical"
+                            android:orientation="horizontal">
+
+                            <View
+                                android:layout_width="1px"
+                                android:layout_height="@dimen/size_60"
+                                android:background="#E1E1E1" />
+
+                            <ImageView
+                                android:id="@+id/img_qrcode"
+                                android:layout_width="@dimen/size_80"
+                                android:layout_height="@dimen/size_80"
+                                android:layout_marginLeft="@dimen/size_20" />
+                        </LinearLayout>
+                    </LinearLayout>
+
+                    <include layout="@layout/common_line" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="@dimen/size_5"
+                        android:drawableLeft="@drawable/common_icon_logo_small"
+                        android:drawablePadding="@dimen/size_3"
+                        android:text="滴房车app，带你走进房车生活"
+                        android:textColor="@color/gray_B4B4B4"
+                        android:textSize="@dimen/text_8" />
+                </LinearLayout>
+            </ScrollView>
+        </android.support.v7.widget.CardView>
+        <!--</LinearLayout>-->
+
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/size_70"
+            android:layout_gravity="bottom"
+            android:layout_marginLeft="@dimen/size_10"
+            android:layout_marginRight="@dimen/size_10"
+            android:gravity="center_horizontal|bottom"
+            android:orientation="horizontal"
+            android:paddingTop="@dimen/size_20"
+            android:paddingBottom="@dimen/size_10">
+
+            <TextView
+                android:id="@+id/tv_item_save_bill"
+                android:layout_width="0dp"
+                android:layout_height="@dimen/dp_40"
+                android:layout_weight="1"
+                android:background="@drawable/shape_rv_bg_shallow_while_circle"
+                android:gravity="center"
+                android:text="保存海报"
+                android:textColor="#FE9C36"
+                android:textSize="@dimen/sp_16" />
+
+            <TextView
+                android:id="@+id/tv_item_share"
+                android:layout_width="0dp"
+                android:layout_height="@dimen/dp_40"
+                android:layout_marginLeft="@dimen/size_10"
+                android:layout_weight="1"
+                android:background="@drawable/shape_rv_bg_shallow_dark_yellow_circle"
+                android:gravity="center"
+                android:text="马上分享"
+                android:textColor="@color/white"
+                android:textSize="@dimen/sp_16" />
+
+        </LinearLayout>
+
+    </FrameLayout>
+
+</LinearLayout>
\ No newline at end of file

plugin_search/src/main/AndroidManifest.xml

@@ -3,7 +3,9 @@
     package="com.rv.plugin.search">
 
     <application>
-        <activity android:name="com.rv.search.TravelSearchActivity"></activity>
+        <activity
+            android:name="com.rv.search.TravelSearchActivity"
+            android:screenOrientation="portrait" />
     </application>
 
 </manifest>
\ No newline at end of file

plugin_share/src/main/AndroidManifest.xml

@@ -4,21 +4,33 @@
 
     <application>
 
-        <activity android:name=".ShareActivity" />
-        <activity android:name=".BillActivity" />
-        <activity android:name=".WebViewActivity">
+        <activity
+            android:name=".ShareActivity"
+            android:screenOrientation="portrait" />
+        <activity
+            android:name=".BillActivity"
+            android:screenOrientation="portrait" />
+        <activity
+            android:name=".WebViewActivity"
+            android:screenOrientation="portrait" />
 
-            <!-- <intent-filter> -->
-            <!-- <data android:scheme="rv" android:host="xxfc" android:path="/activity" /> -->
-            <!-- &lt;!&ndash;下面这几行也必须得设置&ndash;&gt; -->
-            <!-- <category android:name="android.intent.category.DEFAULT"/> -->
-            <!-- <action android:name="android.intent.action.VIEW"/> -->
-            <!-- <category android:name="android.intent.category.BROWSABLE"/> -->
-            <!-- </intent-filter> -->
-        </activity>
-        <activity android:name=".ReativeBillActivity" />
-        <activity android:name=".PopularizeActivity" />
-        <activity android:name=".ShareRulerActivity" />
+        <!-- <intent-filter> -->
+        <!-- <data android:scheme="rv" android:host="xxfc" android:path="/activity" /> -->
+        <!-- &lt;!&ndash;下面这几行也必须得设置&ndash;&gt; -->
+        <!-- <category android:name="android.intent.category.DEFAULT"/> -->
+        <!-- <action android:name="android.intent.action.VIEW"/> -->
+        <!-- <category android:name="android.intent.category.BROWSABLE"/> -->
+        <!-- </intent-filter> -->
+
+        <activity
+            android:name=".ReativeBillActivity"
+            android:screenOrientation="portrait" />
+        <activity
+            android:name=".PopularizeActivity"
+            android:screenOrientation="portrait" />
+        <activity
+            android:name=".ShareRulerActivity"
+            android:screenOrientation="portrait" />
     </application>
 
 </manifest>
\ No newline at end of file

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

@@ -98,7 +98,7 @@ public class ReativeBillActivity extends BaseStatusActivity<ReativeBillPresenter
 
         UserInfoBean userInfoBean = (UserInfoBean) RvCache.getInstance(getApplicationContext()).get(CacheEnum.USER);
 
-        String name = userInfoBean.getData().getRealname();
+        String name = userInfoBean.getData().getNickname();
         String url = userInfoBean.getData().getHeadimgurl();
         if (!TextUtils.isEmpty(url)) {
             GlideManager.getInstance(getApplicationContext()).loadImage(url, roundImageView,R.drawable.icon_bill_defult);

plugin_share/src/main/java/com/rv/share/view/RvWebView.java

@@ -129,7 +129,7 @@ public class RvWebView extends WebView {
         @JavascriptInterface
         public String getTokenOrLogin() {
             if (TextUtils.isEmpty(OkGoUtil.getToken())) {
-                Intent intent = LoginRvActivity.getIntent(getContext()) ;
+                Intent intent = LoginRvActivity.getIntent(getContext(),1) ;
                 intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK) ;
                 getContext().startActivity(intent);
                 return "";

plugin_wallet/src/main/AndroidManifest.xml

@@ -3,14 +3,30 @@
     package="com.xxrv.wallet">
 
     <application>
-        <activity android:name=".activity.CashWithdrawalDetailsActivity" />
-        <activity android:name=".activity.WithdrawActivity" />
-        <activity android:name=".activity.WalletActivity" />
-        <activity android:name=".activity.ConsumeDetailActivity" />
-        <activity android:name=".activity.CommissionDetailActivity" />
-        <activity android:name=".activity.EnchashmentRecordActivity"></activity>
-        <activity android:name=".activity.SetPayPwdActivity" />
-        <activity android:name=".activity.SetPayPwdActivity2" />
+        <activity
+            android:name=".activity.CashWithdrawalDetailsActivity"
+            android:screenOrientation="portrait" />
+        <activity
+            android:name=".activity.WithdrawActivity"
+            android:screenOrientation="portrait" />
+        <activity
+            android:name=".activity.WalletActivity"
+            android:screenOrientation="portrait" />
+        <activity
+            android:name=".activity.ConsumeDetailActivity"
+            android:screenOrientation="portrait" />
+        <activity
+            android:name=".activity.CommissionDetailActivity"
+            android:screenOrientation="portrait" />
+        <activity
+            android:name=".activity.EnchashmentRecordActivity"
+            android:screenOrientation="portrait" />
+        <activity
+            android:name=".activity.SetPayPwdActivity"
+            android:screenOrientation="portrait" />
+        <activity
+            android:name=".activity.SetPayPwdActivity2"
+            android:screenOrientation="portrait" />
     </application>
 
 </manifest>
\ No newline at end of file