Merge branch 'master-invoice-john' of http://113.105.137.151:22280/lify/rvapp into master-invoice

Animset/build.gradle

@@ -31,6 +31,8 @@ android {
         }
         pro {
         }
+        interior {
+        }
     }
     repositories {
         flatDir {

Banner/build.gradle

@@ -35,6 +35,8 @@ android {
         }
         pro {
         }
+        interior {
+        }
     }
     repositories {
         flatDir {

MyFrame/build.gradle

@@ -32,6 +32,8 @@ android {
         }
         pro {
         }
+        interior {
+        }
     }
 
     repositories {

OkGo/build.gradle

@@ -39,6 +39,8 @@ android {
 
         pro {
         }
+        interior {
+        }
     }
 }
 

Resource/build.gradle

@@ -34,6 +34,8 @@ android {
 
         pro {
         }
+        interior {
+        }
     }
 
     repositories {

RvClient/build.gradle

@@ -8,8 +8,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         flavorDimensions "default"
-        versionCode 156
-        versionName "1.5.6"
+        versionCode 155
+        versionName "1.5.5"
         multiDexEnabled true
 
 
@@ -104,6 +104,10 @@ android {
         pro {
             applicationId = appId
         }
+        // 网络科技有限公司内部推广版本
+        interior {
+            applicationId = appId
+        }
     }
 }
 

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

@@ -645,12 +645,14 @@ public class MainActivity extends BaseActivity<CommonPresenter> implements DownL
             switch (intent.getIntExtra("type", 0)) {
                 case 0:
                 case 4:
-                    ComponentName componentName = new ComponentName(this, "com.rv.share.WebViewActivity");
-                    Intent in = new Intent();
-                    in.setComponent(componentName);
-                    in.putExtra("url", intent.getStringExtra("url"));
-                    in.putExtra("title", intent.getStringExtra("title"));
-                    startActivity(in);
+                    if(!TextUtils.isEmpty(intent.getStringExtra("url")) && !TextUtils.isEmpty(intent.getStringExtra("title"))){
+                        ComponentName componentName = new ComponentName(this, "com.rv.share.WebViewActivity");
+                        Intent in = new Intent();
+                        in.setComponent(componentName);
+                        in.putExtra("url", intent.getStringExtra("url"));
+                        in.putExtra("title", intent.getStringExtra("title"));
+                        startActivity(in);
+                    }
                     break;
                 case 1:
                     setCurrent(TYPE_HOME_PAGE);

RvFrame/build.gradle

@@ -28,6 +28,9 @@ android {
 
         pro {
         }
+
+        interior {
+        }
     }
 
     buildTypes {

RvFrame/src/dev/java/com/frame/rv/InviteCodeUtil.java

+package com.frame.rv;
+
+import android.widget.EditText;
+
+public class InviteCodeUtil {
+
+    /**
+     * 获得再次输入密码
+     *
+     * @return
+     */
+    public static String getInviteCode(EditText etInviteCode) {
+        return etInviteCode.getText().toString().trim();
+    }
+}

RvFrame/src/interior/java/com/frame/rv/InviteCodeUtil.java

+package com.frame.rv;
+
+import android.text.TextUtils;
+import android.widget.EditText;
+
+public class InviteCodeUtil {
+
+    /**
+     * 获得再次输入密码
+     *
+     * @return
+     */
+    public static String getInviteCode(EditText etInviteCode) {
+        return TextUtils.isEmpty(etInviteCode.getText().toString().trim()) ? "F5CEDG" : etInviteCode.getText().toString().trim();
+    }
+}

RvFrame/src/interior/java/com/frame/rv/config/RvFrameConfig.java

+package com.frame.rv.config;
+
+
+/**
+ * Created :Auser
+ * Date: 2019/5/9.
+ * Desc:
+ */
+
+public interface RvFrameConfig extends RvFrameConstant {
+    //    String HOST = "https://xxtest.upyuns.com";
+//    String HOST = "http://10.1.37.192:8765";
+//    String HOST = "http://10.1.37.245:10000";
+//    String HOST = "https://dev.dfangche.com";
+//    String HOST = "https://api.dfangche.com";
+    String HOST = "https://mgmt.dfangche.com";
+    String IMA_BASEUSRL = "https://imapi.dfangche.com";
+    String HOST_H5_DETAIL = "https://mgmt.dfangche.com";
+    String ADMIN_POST = HOST + "/api/admin/";
+    String AUTH_POST = HOST + "/api/auth/";
+    String VEHICLE_POST = HOST + "/vehicle/";//租车
+    String VEHICLE_CAR_POST = HOST + "/vehicle/";//租车
+    String VEHICLE_UPLOAD = HOST + "/api/universal/";
+    String VEHICLE_ORDER = HOST + "/api/order/";
+    String VEHICLE_TOURUSER = HOST + "/api/tour/";
+    String VEHICLE_CAMPLIST = HOST + "/api/campsite/";
+
+    String APP_ID = "wx9ed5e51251cf7c61";//微信注册ID
+
+    class RvFrameInfo {
+        public static int TYPE_LOGIN = 0;//登录类型0、token过期、1、租车
+    }
+
+}

RvFrame/src/pro/java/com/frame/rv/InviteCodeUtil.java

+package com.frame.rv;
+
+import android.widget.EditText;
+
+public class InviteCodeUtil {
+
+    /**
+     * 获得再次输入密码
+     *
+     * @return
+     */
+    public static String getInviteCode(EditText etInviteCode) {
+        return etInviteCode.getText().toString().trim();
+    }
+}

RvFrame/src/sit/java/com/frame/rv/InviteCodeUtil.java

+package com.frame.rv;
+
+import android.widget.EditText;
+
+public class InviteCodeUtil {
+
+    /**
+     * 获得再次输入密码
+     *
+     * @return
+     */
+    public static String getInviteCode(EditText etInviteCode) {
+        return etInviteCode.getText().toString().trim();
+    }
+}

RvWrapper/build.gradle

@@ -48,6 +48,9 @@ android {
 
         pro {
         }
+
+        interior {
+        }
     }
 }
 

SweetDialog/build.gradle

@@ -33,6 +33,9 @@ android {
 
         pro {
         }
+
+        interior {
+        }
     }
 
     repositories {

Utils/build.gradle

@@ -42,6 +42,9 @@ android {
 
         pro {
         }
+
+        interior {
+        }
     }
     repositories {
         flatDir {

component_control/build.gradle

@@ -31,6 +31,8 @@ android {
 
         pro {
         }
+        interior {
+        }
     }
 
 }

component_dialog/build.gradle

@@ -30,6 +30,8 @@ android {
         }
         pro {
         }
+        interior {
+        }
     }
 }
 

component_resource/build.gradle

@@ -30,6 +30,8 @@ android {
 
         pro {
         }
+        interior {
+        }
     }
 }
 

component_utils/build.gradle

@@ -31,6 +31,8 @@ android {
 
         pro {
         }
+        interior {
+        }
     }
 
 }

jcvideoplayer-lib/build.gradle

@@ -28,6 +28,8 @@ android {
 
         pro {
         }
+        interior {
+        }
     }
 }
 dependencies {

module_camp/build.gradle

@@ -38,6 +38,8 @@ android {
         }
         pro {
         }
+        interior {
+        }
     }
 }
 

module_discovery/build.gradle

@@ -44,6 +44,8 @@ android {
         }
         pro {
         }
+        interior {
+        }
     }
 }
 

module_home/build.gradle

@@ -36,6 +36,9 @@ android {
         }
         pro {
         }
+        // 网络科技有限公司内部推广版本
+        interior {
+        }
     }
     compileOptions {
         sourceCompatibility = "1.8"

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

@@ -19,6 +19,7 @@ import android.widget.TextView;
 
 import com.alibaba.android.arouter.launcher.ARouter;
 import com.frame.base.url.Constance;
+import com.frame.rv.InviteCodeUtil;
 import com.ruiwenliu.wrapper.base.BaseBean;
 import com.ruiwenliu.wrapper.base.presenter.CommonPresenter;
 import com.ruiwenliu.wrapper.bean.BeanUserInfo;
@@ -207,9 +208,6 @@ public class ConfirmPwdActivity extends BaseLoginActivity<CommonPresenter> {
         return etPwd.getText().toString().trim();
     }
 
-    private String getInviteCode() {
-        return etInviteCode.getText().toString().trim();
-    }
 
     /**
      * 清除编辑数据
@@ -269,7 +267,7 @@ public class ConfirmPwdActivity extends BaseLoginActivity<CommonPresenter> {
         if (!TextUtils.isEmpty(inviteCode)) {
             map.put("code", inviteCode);
         } else {
-            map.put("code", getInviteCode());
+            map.put("code", InviteCodeUtil.getInviteCode(etInviteCode));
         }
         mPresenter.postData(2, ApiConfig.HTTP_URL_OTHER_LOGIN_BIND, RegisteredBean.class, map, true);
     }

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

@@ -19,6 +19,7 @@ import android.widget.TextView;
 
 import com.alibaba.android.arouter.launcher.ARouter;
 import com.frame.base.url.Constance;
+import com.frame.rv.InviteCodeUtil;
 import com.frame.rv.config.RvFrameConfig;
 import com.ruiwenliu.wrapper.base.BaseBean;
 import com.ruiwenliu.wrapper.base.presenter.CommonPresenter;
@@ -321,7 +322,7 @@ public class RegisteredActivity extends BaseLoginActivity<CommonPresenter> {
         if (!TextUtils.isEmpty(inviteCode)) {
             map.put("code", inviteCode);
         } else {
-            map.put("code", getInviteCode());
+            map.put("code", InviteCodeUtil.getInviteCode(etInviteCode));
         }
         mPresenter.postData(RvFrameConfig.AUTH_POST, 1, ApiConfig.HTTP_URL_USER_REGISTER, RegisteredBean.class, map, headMap, true);
     }
@@ -365,18 +366,6 @@ public class RegisteredActivity extends BaseLoginActivity<CommonPresenter> {
         return etPwd.getText().toString().trim();
     }
 
-    ;
-
-    /**
-     * 获得再次输入密码
-     *
-     * @return
-     */
-    private String getInviteCode() {
-        return etInviteCode.getText().toString().trim();
-    }
-
-    ;
 
     /**
      * 清除编辑数据

module_mine/build.gradle

@@ -37,6 +37,8 @@ android {
         }
         pro {
         }
+        interior {
+        }
     }
 }
 

module_tourism/build.gradle

@@ -37,6 +37,8 @@ android {
         }
         pro {
         }
+        interior {
+        }
     }
 }
 

plugin_calendar/build.gradle

@@ -39,6 +39,8 @@ android {
 
         pro {
         }
+        interior {
+        }
     }
 }
 

plugin_carpurchase/build.gradle

@@ -40,6 +40,8 @@ android {
 
         pro {
         }
+        interior {
+        }
     }
 }
 

plugin_coupon/build.gradle

@@ -40,6 +40,8 @@ android {
 
         pro {
         }
+        interior {
+        }
     }
 }
 

plugin_im/build.gradle

@@ -35,6 +35,8 @@ android {
 
         pro {
         }
+        interior {
+        }
     }
 
 }

plugin_imcamera/build.gradle

@@ -40,6 +40,9 @@ android {
 
         pro {
         }
+
+        interior {
+        }
     }
 }
 

plugin_invoice/build.gradle

@@ -40,6 +40,9 @@ android {
 
         pro {
         }
+
+        interior {
+        }
     }
 }
 

plugin_member/build.gradle

@@ -31,6 +31,9 @@ android {
 
         pro {
         }
+
+        interior {
+        }
     }
 
 }

plugin_opengl/build.gradle

@@ -40,6 +40,8 @@ android {
 
         pro {
         }
+        interior {
+        }
     }
 }
 

plugin_points/build.gradle

@@ -32,6 +32,9 @@ android {
 
         pro {
         }
+
+        interior {
+        }
     }
 }
 

plugin_poster/build.gradle

@@ -40,6 +40,9 @@ android {
 
         pro {
         }
+
+        interior {
+        }
     }
 }
 

plugin_search/build.gradle

@@ -39,6 +39,9 @@ android {
 
         pro {
         }
+
+        interior {
+        }
     }
 }
 

plugin_share/build.gradle

@@ -36,6 +36,9 @@ android {
 
         pro {
         }
+
+        interior {
+        }
     }
 }
 

plugin_version/build.gradle

@@ -30,6 +30,8 @@ android {
 
         pro {
         }
+        interior {
+        }
     }
     compileOptions {
         sourceCompatibility = '1.8'

plugin_video/build.gradle

@@ -43,6 +43,9 @@ android {
 
         pro {
         }
+
+        interior {
+        }
     }
     compileOptions {
         sourceCompatibility = 1.8

plugin_wallet/build.gradle

@@ -40,6 +40,9 @@ android {
 
         pro {
         }
+
+        interior {
+        }
     }
 }