Commit 1341ecb1 authored by linfeng's avatar linfeng

按钮动图

parent 8709659a
...@@ -33,6 +33,33 @@ android { ...@@ -33,6 +33,33 @@ android {
} }
interior { interior {
} }
huawei {
}
xiaomi {
}
vivo {
}
oppo {
}
meizu {
}
yingyoungbao {
}
baidu {
}
rv360 {
}
wandoujia {
}
} }
repositories { repositories {
flatDir { flatDir {
......
...@@ -37,6 +37,33 @@ android { ...@@ -37,6 +37,33 @@ android {
} }
interior { interior {
} }
huawei {
}
xiaomi {
}
vivo {
}
oppo {
}
meizu {
}
yingyoungbao {
}
baidu {
}
rv360 {
}
wandoujia {
}
} }
repositories { repositories {
flatDir { flatDir {
......
...@@ -34,6 +34,33 @@ android { ...@@ -34,6 +34,33 @@ android {
} }
interior { interior {
} }
huawei {
}
xiaomi {
}
vivo {
}
oppo {
}
meizu {
}
yingyoungbao {
}
baidu {
}
rv360 {
}
wandoujia {
}
} }
repositories { repositories {
......
...@@ -41,6 +41,33 @@ android { ...@@ -41,6 +41,33 @@ android {
} }
interior { interior {
} }
huawei {
}
xiaomi {
}
vivo {
}
oppo {
}
meizu {
}
yingyoungbao {
}
baidu {
}
rv360 {
}
wandoujia {
}
} }
} }
......
...@@ -36,6 +36,33 @@ android { ...@@ -36,6 +36,33 @@ android {
} }
interior { interior {
} }
huawei {
}
xiaomi {
}
vivo {
}
oppo {
}
meizu {
}
yingyoungbao {
}
baidu {
}
rv360 {
}
wandoujia {
}
} }
repositories { repositories {
......
...@@ -108,6 +108,43 @@ android { ...@@ -108,6 +108,43 @@ android {
interior { interior {
applicationId = appId applicationId = appId
} }
huawei {
applicationId = appId
}
xiaomi {
applicationId = appId
}
vivo {
applicationId = appId
}
oppo {
applicationId = appId
}
meizu {
applicationId = appId
}
yingyoungbao {
applicationId = appId
}
baidu {
applicationId = appId
}
rv360 {
applicationId = appId
}
wandoujia {
applicationId = appId
}
} }
} }
......
<resources>
<string name="app_name">滴房车</string>
<string name="share_install_key">B7BK2A6722BAH6</string>
<string name="share_install_scheme">pdfd6612</string>
</resources>
<resources>
<string name="app_name">滴房车</string>
<string name="share_install_key">B7BK2A6722BAH6</string>
<string name="share_install_scheme">pdfd6612</string>
</resources>
...@@ -509,7 +509,43 @@ public class MainActivity extends BaseActivity<CommonPresenter> implements DownL ...@@ -509,7 +509,43 @@ public class MainActivity extends BaseActivity<CommonPresenter> implements DownL
* 设置view的样式 * 设置view的样式
*/ */
private void setViewStyle(ImageView imageView, TextView textView, boolean isTrue) { private void setViewStyle(ImageView imageView, TextView textView, boolean isTrue) {
imageView.setSelected(isTrue); // imageView.setSelected(isTrue);
if (imageView ==ivHome){
if (isTrue){
GlideManager.getInstance(mActivity).loadGifImage(R.drawable.home_icon_motion_home, imageView,1);
return;
}else {
GlideManager.getInstance(mActivity).loadImage2(R.drawable.home_icon_home_unselected, imageView);
}
}else if (imageView ==ivTravel){
if (isTrue){
GlideManager.getInstance(mActivity).loadGifImage(R.drawable.home_icon_motion_travel, imageView,1);
return;
}else {
GlideManager.getInstance(mActivity).loadImage2(R.drawable.home_icon_travel_unselected, imageView);
}
}else if (imageView ==ivCamp){
if (isTrue){
GlideManager.getInstance(mActivity).loadGifImage(R.drawable.home_icon_motion_campsite, imageView,1);
return;
}else {
GlideManager.getInstance(mActivity).loadImage2(R.drawable.home_icon_campsite_unselected, imageView);
}
}else if (imageView ==ivFound){
if (isTrue){
GlideManager.getInstance(mActivity).loadGifImage(R.drawable.home_icon_motion_discover, imageView,1);
return;
}else {
GlideManager.getInstance(mActivity).loadImage2(R.drawable.home_icon_discover_unselected, imageView);
}
}else if (imageView == ivMine){
if (isTrue){
GlideManager.getInstance(mActivity).loadGifImage(R.drawable.home_icon_motion_mine, imageView,1);
return;
}else {
GlideManager.getInstance(mActivity).loadImage2(R.drawable.home_icon_mine_unselected, imageView);
}
}
textView.setTextColor(ContextCompat.getColor(this, isTrue ? R.color.gray_FFB74B : R.color.textMain)); textView.setTextColor(ContextCompat.getColor(this, isTrue ? R.color.gray_FFB74B : R.color.textMain));
} }
...@@ -641,7 +677,7 @@ public class MainActivity extends BaseActivity<CommonPresenter> implements DownL ...@@ -641,7 +677,7 @@ public class MainActivity extends BaseActivity<CommonPresenter> implements DownL
switch (intent.getIntExtra("type", 0)) { switch (intent.getIntExtra("type", 0)) {
case 0: case 0:
case 4: case 4:
if(!TextUtils.isEmpty(intent.getStringExtra("url")) && !TextUtils.isEmpty(intent.getStringExtra("title"))){ if (!TextUtils.isEmpty(intent.getStringExtra("url")) && !TextUtils.isEmpty(intent.getStringExtra("title"))) {
ComponentName componentName = new ComponentName(this, "com.rv.share.WebViewActivity"); ComponentName componentName = new ComponentName(this, "com.rv.share.WebViewActivity");
Intent in = new Intent(); Intent in = new Intent();
in.setComponent(componentName); in.setComponent(componentName);
......
<resources>
<string name="app_name">滴房车</string>
<string name="share_install_key">B7BK2A6722BAH6</string>
<string name="share_install_scheme">pdfd6612</string>
</resources>
<resources>
<string name="app_name">滴房车</string>
<string name="share_install_key">B7BK2A6722BAH6</string>
<string name="share_install_scheme">pdfd6612</string>
</resources>
<resources>
<string name="app_name">滴房车</string>
<string name="share_install_key">B7BK2A6722BAH6</string>
<string name="share_install_scheme">pdfd6612</string>
</resources>
<resources>
<string name="app_name">滴房车</string>
<string name="share_install_key">B7BK2A6722BAH6</string>
<string name="share_install_scheme">pdfd6612</string>
</resources>
<resources>
<string name="app_name">滴房车</string>
<string name="share_install_key">B7BK2A6722BAH6</string>
<string name="share_install_scheme">pdfd6612</string>
</resources>
<resources>
<string name="app_name">滴房车</string>
<string name="share_install_key">B7BK2A6722BAH6</string>
<string name="share_install_scheme">pdfd6612</string>
</resources>
<resources>
<string name="app_name">滴房车</string>
<string name="share_install_key">B7BK2A6722BAH6</string>
<string name="share_install_scheme">pdfd6612</string>
</resources>
...@@ -31,6 +31,33 @@ android { ...@@ -31,6 +31,33 @@ android {
interior { interior {
} }
huawei {
}
xiaomi {
}
vivo {
}
oppo {
}
meizu {
}
yingyoungbao {
}
baidu {
}
rv360 {
}
wandoujia {
}
} }
buildTypes { buildTypes {
......
package com.frame.rv;
import android.widget.EditText;
public class InviteCodeUtil {
/**
* 获得再次输入密码
*
* @return
*/
public static String getInviteCode(EditText etInviteCode) {
return etInviteCode.getText().toString().trim();
}
/**
* 应用市场标识
*
* @return
*/
public static String getApplicationID() {
return "107";
}
}
package com.frame.rv.config;
/**
* Created :Auser
* Date: 2019/5/9.
* Desc:
*/
public interface RvFrameConfig extends RvFrameConstant {
String HOST = "https://xxtest.upyuns.com";
String IMA_BASEUSRL = "https://xxfcim.upyuns.com/xxfcim";
// 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 HOST_H5_DETAIL = "https://mgmt.dfangche.com";
String HOST_H5_DETAIL = HOST;
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、租车
}
}
...@@ -12,4 +12,13 @@ public class InviteCodeUtil { ...@@ -12,4 +12,13 @@ public class InviteCodeUtil {
public static String getInviteCode(EditText etInviteCode) { public static String getInviteCode(EditText etInviteCode) {
return etInviteCode.getText().toString().trim(); return etInviteCode.getText().toString().trim();
} }
/**
* 应用市场标识
*
* @return
*/
public static String getApplicationID() {
return "";
}
} }
package com.frame.rv;
import android.widget.EditText;
public class InviteCodeUtil {
/**
* 获得再次输入密码
*
* @return
*/
public static String getInviteCode(EditText etInviteCode) {
return etInviteCode.getText().toString().trim();
}
/**
* 应用市场标识
*
* @return
*/
public static String getApplicationID() {
return "101";
}
}
package com.frame.rv.config;
/**
* Created :Auser
* Date: 2019/5/9.
* Desc:
*/
public interface RvFrameConfig extends RvFrameConstant {
String HOST = "https://xxtest.upyuns.com";
String IMA_BASEUSRL = "https://xxfcim.upyuns.com/xxfcim";
// 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 HOST_H5_DETAIL = "https://mgmt.dfangche.com";
String HOST_H5_DETAIL = HOST;
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、租车
}
}
...@@ -13,4 +13,13 @@ public class InviteCodeUtil { ...@@ -13,4 +13,13 @@ public class InviteCodeUtil {
public static String getInviteCode(EditText etInviteCode) { public static String getInviteCode(EditText etInviteCode) {
return TextUtils.isEmpty(etInviteCode.getText().toString().trim()) ? "F5CEDG" : etInviteCode.getText().toString().trim(); return TextUtils.isEmpty(etInviteCode.getText().toString().trim()) ? "F5CEDG" : etInviteCode.getText().toString().trim();
} }
/**
* 应用市场标识
*
* @return
*/
public static String getApplicationID() {
return "";
}
} }
package com.frame.rv;
import android.widget.EditText;
public class InviteCodeUtil {
/**
* 获得再次输入密码
*
* @return
*/
public static String getInviteCode(EditText etInviteCode) {
return etInviteCode.getText().toString().trim();
}
/**
* 应用市场标识
*
* @return
*/
public static String getApplicationID() {
return "105";
}
}
package com.frame.rv.config;
/**
* Created :Auser
* Date: 2019/5/9.
* Desc:
*/
public interface RvFrameConfig extends RvFrameConstant {
String HOST = "https://xxtest.upyuns.com";
String IMA_BASEUSRL = "https://xxfcim.upyuns.com/xxfcim";
// 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 HOST_H5_DETAIL = "https://mgmt.dfangche.com";
String HOST_H5_DETAIL = HOST;
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、租车
}
}
package com.frame.rv;
import android.widget.EditText;
public class InviteCodeUtil {
/**
* 获得再次输入密码
*
* @return
*/
public static String getInviteCode(EditText etInviteCode) {
return etInviteCode.getText().toString().trim();
}
/**
* 应用市场标识
*
* @return
*/
public static String getApplicationID() {
return "104";
}
}
package com.frame.rv.config;
/**
* Created :Auser
* Date: 2019/5/9.
* Desc:
*/
public interface RvFrameConfig extends RvFrameConstant {
String HOST = "https://xxtest.upyuns.com";
String IMA_BASEUSRL = "https://xxfcim.upyuns.com/xxfcim";
// 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 HOST_H5_DETAIL = "https://mgmt.dfangche.com";
String HOST_H5_DETAIL = HOST;
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、租车
}
}
...@@ -12,4 +12,13 @@ public class InviteCodeUtil { ...@@ -12,4 +12,13 @@ public class InviteCodeUtil {
public static String getInviteCode(EditText etInviteCode) { public static String getInviteCode(EditText etInviteCode) {
return etInviteCode.getText().toString().trim(); return etInviteCode.getText().toString().trim();
} }
/**
* 应用市场标识
*
* @return
*/
public static String getApplicationID() {
return "";
}
} }
package com.frame.rv;
import android.widget.EditText;
public class InviteCodeUtil {
/**
* 获得再次输入密码
*
* @return
*/
public static String getInviteCode(EditText etInviteCode) {
return etInviteCode.getText().toString().trim();
}
/**
* 应用市场标识
*
* @return
*/
public static String getApplicationID() {
return "108";
}
}
package com.frame.rv.config;
/**
* Created :Auser
* Date: 2019/5/9.
* Desc:
*/
public interface RvFrameConfig extends RvFrameConstant {
String HOST = "https://xxtest.upyuns.com";
String IMA_BASEUSRL = "https://xxfcim.upyuns.com/xxfcim";
// 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 HOST_H5_DETAIL = "https://mgmt.dfangche.com";
String HOST_H5_DETAIL = HOST;
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、租车
}
}
...@@ -12,4 +12,13 @@ public class InviteCodeUtil { ...@@ -12,4 +12,13 @@ public class InviteCodeUtil {
public static String getInviteCode(EditText etInviteCode) { public static String getInviteCode(EditText etInviteCode) {
return etInviteCode.getText().toString().trim(); return etInviteCode.getText().toString().trim();
} }
/**
* 应用市场标识
*
* @return
*/
public static String getApplicationID() {
return "";
}
} }
package com.frame.rv;
import android.widget.EditText;
public class InviteCodeUtil {
/**
* 获得再次输入密码
*
* @return
*/
public static String getInviteCode(EditText etInviteCode) {
return etInviteCode.getText().toString().trim();
}
/**
* 应用市场标识
*
* @return
*/
public static String getApplicationID() {
return "103";
}
}
package com.frame.rv.config;
/**
* Created :Auser
* Date: 2019/5/9.
* Desc:
*/
public interface RvFrameConfig extends RvFrameConstant {
String HOST = "https://xxtest.upyuns.com";
String IMA_BASEUSRL = "https://xxfcim.upyuns.com/xxfcim";
// 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 HOST_H5_DETAIL = "https://mgmt.dfangche.com";
String HOST_H5_DETAIL = HOST;
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、租车
}
}
package com.frame.rv;
import android.widget.EditText;
public class InviteCodeUtil {
/**
* 获得再次输入密码
*
* @return
*/
public static String getInviteCode(EditText etInviteCode) {
return etInviteCode.getText().toString().trim();
}
/**
* 应用市场标识
*
* @return
*/
public static String getApplicationID() {
return "109";
}
}
package com.frame.rv.config;
/**
* Created :Auser
* Date: 2019/5/9.
* Desc:
*/
public interface RvFrameConfig extends RvFrameConstant {
String HOST = "https://xxtest.upyuns.com";
String IMA_BASEUSRL = "https://xxfcim.upyuns.com/xxfcim";
// 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 HOST_H5_DETAIL = "https://mgmt.dfangche.com";
String HOST_H5_DETAIL = HOST;
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、租车
}
}
package com.frame.rv;
import android.widget.EditText;
public class InviteCodeUtil {
/**
* 获得再次输入密码
*
* @return
*/
public static String getInviteCode(EditText etInviteCode) {
return etInviteCode.getText().toString().trim();
}
/**
* 应用市场标识
*
* @return
*/
public static String getApplicationID() {
return "102";
}
}
package com.frame.rv.config;
/**
* Created :Auser
* Date: 2019/5/9.
* Desc:
*/
public interface RvFrameConfig extends RvFrameConstant {
String HOST = "https://xxtest.upyuns.com";
String IMA_BASEUSRL = "https://xxfcim.upyuns.com/xxfcim";
// 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 HOST_H5_DETAIL = "https://mgmt.dfangche.com";
String HOST_H5_DETAIL = HOST;
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、租车
}
}
package com.frame.rv;
import android.widget.EditText;
public class InviteCodeUtil {
/**
* 获得再次输入密码
*
* @return
*/
public static String getInviteCode(EditText etInviteCode) {
return etInviteCode.getText().toString().trim();
}
/**
* 应用市场标识
*
* @return
*/
public static String getApplicationID() {
return "106";
}
}
package com.frame.rv.config;
/**
* Created :Auser
* Date: 2019/5/9.
* Desc:
*/
public interface RvFrameConfig extends RvFrameConstant {
String HOST = "https://xxtest.upyuns.com";
String IMA_BASEUSRL = "https://xxfcim.upyuns.com/xxfcim";
// 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 HOST_H5_DETAIL = "https://mgmt.dfangche.com";
String HOST_H5_DETAIL = HOST;
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、租车
}
}
...@@ -51,6 +51,33 @@ android { ...@@ -51,6 +51,33 @@ android {
interior { interior {
} }
huawei {
}
xiaomi {
}
vivo {
}
oppo {
}
meizu {
}
yingyoungbao {
}
baidu {
}
rv360 {
}
wandoujia {
}
} }
} }
......
...@@ -230,7 +230,7 @@ public class GlideManager { ...@@ -230,7 +230,7 @@ public class GlideManager {
* @param image * @param image
* @param number 循环播放次数 * @param number 循环播放次数
*/ */
public void loadGifImage(String url, final ImageView image, final int number) { public void loadGifImage(Object url, final ImageView image, final int number) {
GlideApp.with(mContext) GlideApp.with(mContext)
.asGif() .asGif()
.load(url) .load(url)
...@@ -273,6 +273,19 @@ public class GlideManager { ...@@ -273,6 +273,19 @@ public class GlideManager {
} }
public void loadGifImage3(Object url, final ImageView image) {
GlideApp.with(mContext)
.load(url)
.apply(new RequestOptions()
.skipMemoryCache(true)
.diskCacheStrategy(DiskCacheStrategy.ALL))
.placeholder(R.drawable.glide_icon_placeholder)
.fallback(R.drawable.glide_icon_error)
.into(image);
}
/** /**
* 获取Gif时长 * 获取Gif时长
*/ */
......
...@@ -36,6 +36,33 @@ android { ...@@ -36,6 +36,33 @@ android {
interior { interior {
} }
huawei {
}
xiaomi {
}
vivo {
}
oppo {
}
meizu {
}
yingyoungbao {
}
baidu {
}
rv360 {
}
wandoujia {
}
} }
repositories { repositories {
......
...@@ -45,6 +45,33 @@ android { ...@@ -45,6 +45,33 @@ android {
interior { interior {
} }
huawei {
}
xiaomi {
}
vivo {
}
oppo {
}
meizu {
}
yingyoungbao {
}
baidu {
}
rv360 {
}
wandoujia {
}
} }
repositories { repositories {
flatDir { flatDir {
......
...@@ -33,6 +33,34 @@ android { ...@@ -33,6 +33,34 @@ android {
} }
interior { interior {
} }
huawei {
}
xiaomi {
}
vivo {
}
oppo {
}
meizu {
}
yingyoungbao {
}
baidu {
}
rv360 {
}
wandoujia {
}
} }
} }
......
...@@ -32,6 +32,33 @@ android { ...@@ -32,6 +32,33 @@ android {
} }
interior { interior {
} }
huawei {
}
xiaomi {
}
vivo {
}
oppo {
}
meizu {
}
yingyoungbao {
}
baidu {
}
rv360 {
}
wandoujia {
}
} }
} }
......
...@@ -32,6 +32,33 @@ android { ...@@ -32,6 +32,33 @@ android {
} }
interior { interior {
} }
huawei {
}
xiaomi {
}
vivo {
}
oppo {
}
meizu {
}
yingyoungbao {
}
baidu {
}
rv360 {
}
wandoujia {
}
} }
} }
......
...@@ -33,6 +33,33 @@ android { ...@@ -33,6 +33,33 @@ android {
} }
interior { interior {
} }
huawei {
}
xiaomi {
}
vivo {
}
oppo {
}
meizu {
}
yingyoungbao {
}
baidu {
}
rv360 {
}
wandoujia {
}
} }
} }
......
...@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME ...@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
\ No newline at end of file
...@@ -30,6 +30,33 @@ android { ...@@ -30,6 +30,33 @@ android {
} }
interior { interior {
} }
huawei {
}
xiaomi {
}
vivo {
}
oppo {
}
meizu {
}
yingyoungbao {
}
baidu {
}
rv360 {
}
wandoujia {
}
} }
} }
dependencies { dependencies {
......
...@@ -40,6 +40,33 @@ android { ...@@ -40,6 +40,33 @@ android {
} }
interior { interior {
} }
huawei {
}
xiaomi {
}
vivo {
}
oppo {
}
meizu {
}
yingyoungbao {
}
baidu {
}
rv360 {
}
wandoujia {
}
} }
} }
......
...@@ -46,6 +46,33 @@ android { ...@@ -46,6 +46,33 @@ android {
} }
interior { interior {
} }
huawei {
}
xiaomi {
}
vivo {
}
oppo {
}
meizu {
}
yingyoungbao {
}
baidu {
}
rv360 {
}
wandoujia {
}
} }
} }
......
...@@ -39,6 +39,33 @@ android { ...@@ -39,6 +39,33 @@ android {
// 网络科技有限公司内部推广版本 // 网络科技有限公司内部推广版本
interior { interior {
} }
huawei {
}
xiaomi {
}
vivo {
}
oppo {
}
meizu {
}
yingyoungbao {
}
baidu {
}
rv360 {
}
wandoujia {
}
} }
compileOptions { compileOptions {
sourceCompatibility = "1.8" sourceCompatibility = "1.8"
......
...@@ -4,11 +4,13 @@ import android.app.ProgressDialog; ...@@ -4,11 +4,13 @@ import android.app.ProgressDialog;
import android.content.Intent; import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
import android.support.annotation.Nullable; import android.support.annotation.Nullable;
import android.text.TextUtils;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.frame.base.bus.LoginSuccessfulEvent; import com.frame.base.bus.LoginSuccessfulEvent;
import com.frame.base.bus.LoginUserInfoEvent; import com.frame.base.bus.LoginUserInfoEvent;
import com.frame.base.bus.RxBus; import com.frame.base.bus.RxBus;
import com.frame.rv.InviteCodeUtil;
import com.frame.rv.config.RvFrameConfig; import com.frame.rv.config.RvFrameConfig;
import com.ruiwenliu.wrapper.SPConstance; import com.ruiwenliu.wrapper.SPConstance;
import com.ruiwenliu.wrapper.base.BaseStatusActivity; import com.ruiwenliu.wrapper.base.BaseStatusActivity;
...@@ -130,6 +132,11 @@ public abstract class BaseLoginActivity<P extends MvpPresenter> extends BaseStat ...@@ -130,6 +132,11 @@ public abstract class BaseLoginActivity<P extends MvpPresenter> extends BaseStat
map.put("unionid", uid); map.put("unionid", uid);
} }
map.put("code", AppCookie.getStringValue("code")); map.put("code", AppCookie.getStringValue("code"));
if (!TextUtils.isEmpty(InviteCodeUtil.getApplicationID())) {
map.put("registerSource", InviteCodeUtil.getApplicationID());
}
mPresenter.postData(2, ApiConfig.HTTP_URL_OTHER_LOGIN_BIND, RegisteredBean.class, map, true); mPresenter.postData(2, ApiConfig.HTTP_URL_OTHER_LOGIN_BIND, RegisteredBean.class, map, true);
} }
......
...@@ -269,6 +269,11 @@ public class ConfirmPwdActivity extends BaseLoginActivity<CommonPresenter> { ...@@ -269,6 +269,11 @@ public class ConfirmPwdActivity extends BaseLoginActivity<CommonPresenter> {
} else { } else {
map.put("code", InviteCodeUtil.getInviteCode(etInviteCode)); map.put("code", InviteCodeUtil.getInviteCode(etInviteCode));
} }
if (!TextUtils.isEmpty(InviteCodeUtil.getApplicationID())) {
map.put("registerSource", InviteCodeUtil.getApplicationID());
}
mPresenter.postData(2, ApiConfig.HTTP_URL_OTHER_LOGIN_BIND, RegisteredBean.class, map, true); mPresenter.postData(2, ApiConfig.HTTP_URL_OTHER_LOGIN_BIND, RegisteredBean.class, map, true);
} }
......
...@@ -128,6 +128,9 @@ public class RegisteredActivity extends BaseLoginActivity<CommonPresenter> { ...@@ -128,6 +128,9 @@ public class RegisteredActivity extends BaseLoginActivity<CommonPresenter> {
initData(); initData();
if (mType == 0) if (mType == 0)
privacyAgree(); privacyAgree();
showToast(InviteCodeUtil.getApplicationID());
} }
...@@ -402,6 +405,10 @@ public class RegisteredActivity extends BaseLoginActivity<CommonPresenter> { ...@@ -402,6 +405,10 @@ public class RegisteredActivity extends BaseLoginActivity<CommonPresenter> {
} else { } else {
map.put("code", InviteCodeUtil.getInviteCode(etInviteCode)); map.put("code", InviteCodeUtil.getInviteCode(etInviteCode));
} }
if (!TextUtils.isEmpty(InviteCodeUtil.getApplicationID())) {
map.put("registerSource", InviteCodeUtil.getApplicationID());
}
mPresenter.postData(RvFrameConfig.AUTH_POST, 1, ApiConfig.HTTP_URL_USER_REGISTER, RegisteredBean.class, map, headMap, true); mPresenter.postData(RvFrameConfig.AUTH_POST, 1, ApiConfig.HTTP_URL_USER_REGISTER, RegisteredBean.class, map, headMap, true);
} }
......
...@@ -39,6 +39,33 @@ android { ...@@ -39,6 +39,33 @@ android {
} }
interior { interior {
} }
huawei {
}
xiaomi {
}
vivo {
}
oppo {
}
meizu {
}
yingyoungbao {
}
baidu {
}
rv360 {
}
wandoujia {
}
} }
} }
......
...@@ -39,6 +39,33 @@ android { ...@@ -39,6 +39,33 @@ android {
} }
interior { interior {
} }
huawei {
}
xiaomi {
}
vivo {
}
oppo {
}
meizu {
}
yingyoungbao {
}
baidu {
}
rv360 {
}
wandoujia {
}
} }
} }
......
...@@ -41,6 +41,33 @@ android { ...@@ -41,6 +41,33 @@ android {
} }
interior { interior {
} }
huawei {
}
xiaomi {
}
vivo {
}
oppo {
}
meizu {
}
yingyoungbao {
}
baidu {
}
rv360 {
}
wandoujia {
}
} }
} }
......
...@@ -42,6 +42,33 @@ android { ...@@ -42,6 +42,33 @@ android {
} }
interior { interior {
} }
huawei {
}
xiaomi {
}
vivo {
}
oppo {
}
meizu {
}
yingyoungbao {
}
baidu {
}
rv360 {
}
wandoujia {
}
} }
} }
......
...@@ -42,6 +42,33 @@ android { ...@@ -42,6 +42,33 @@ android {
} }
interior { interior {
} }
huawei {
}
xiaomi {
}
vivo {
}
oppo {
}
meizu {
}
yingyoungbao {
}
baidu {
}
rv360 {
}
wandoujia {
}
} }
} }
......
...@@ -37,6 +37,33 @@ android { ...@@ -37,6 +37,33 @@ android {
} }
interior { interior {
} }
huawei {
}
xiaomi {
}
vivo {
}
oppo {
}
meizu {
}
yingyoungbao {
}
baidu {
}
rv360 {
}
wandoujia {
}
} }
} }
......
...@@ -43,6 +43,33 @@ android { ...@@ -43,6 +43,33 @@ android {
interior { interior {
} }
huawei {
}
xiaomi {
}
vivo {
}
oppo {
}
meizu {
}
yingyoungbao {
}
baidu {
}
rv360 {
}
wandoujia {
}
} }
} }
......
...@@ -43,6 +43,33 @@ android { ...@@ -43,6 +43,33 @@ android {
interior { interior {
} }
huawei {
}
xiaomi {
}
vivo {
}
oppo {
}
meizu {
}
yingyoungbao {
}
baidu {
}
rv360 {
}
wandoujia {
}
} }
} }
......
...@@ -96,8 +96,8 @@ public class OrderInvoicingCarActivity extends BaseStatusActivity<InvoicePresent ...@@ -96,8 +96,8 @@ public class OrderInvoicingCarActivity extends BaseStatusActivity<InvoicePresent
type = intent.getIntExtra("type", 1); type = intent.getIntExtra("type", 1);
mAdapter = new OrderInvoicingCarAdapter(); mAdapter = new OrderInvoicingCarAdapter();
rvContent.setLayoutManager(new LinearLayoutManager(mActivity, LinearLayoutManager.VERTICAL, false));
mAdapter.setOnLoadMoreListener(this, rvContent); mAdapter.setOnLoadMoreListener(this, rvContent);
rvContent.setLayoutManager(new LinearLayoutManager(mActivity, LinearLayoutManager.VERTICAL, false));
mSimpleRefreshLayout.setHeaderView(new SimpleRefreshView(this)); mSimpleRefreshLayout.setHeaderView(new SimpleRefreshView(this));
mSimpleRefreshLayout.setOnSimpleRefreshListener(this); mSimpleRefreshLayout.setOnSimpleRefreshListener(this);
rvContent.setAdapter(mAdapter); rvContent.setAdapter(mAdapter);
...@@ -239,7 +239,6 @@ public class OrderInvoicingCarActivity extends BaseStatusActivity<InvoicePresent ...@@ -239,7 +239,6 @@ public class OrderInvoicingCarActivity extends BaseStatusActivity<InvoicePresent
headMap.put("Authorization", OkGoUtil.getToken()); headMap.put("Authorization", OkGoUtil.getToken());
Map<String, Object> mapData = new LinkedHashMap<>(); Map<String, Object> mapData = new LinkedHashMap<>();
mapData.put("page", page); mapData.put("page", page);
mapData.put("limit", 10);
mapData.put("multiStatus", "6"); mapData.put("multiStatus", "6");
mapData.put("type", type); //"订单类型 1--租车;2--旅游; 3--会员订单") mapData.put("type", type); //"订单类型 1--租车;2--旅游; 3--会员订单")
mapData.put("invoiceStatus", "0"); //"开票状态,0未开票,1已开票 mapData.put("invoiceStatus", "0"); //"开票状态,0未开票,1已开票
...@@ -270,7 +269,7 @@ public class OrderInvoicingCarActivity extends BaseStatusActivity<InvoicePresent ...@@ -270,7 +269,7 @@ public class OrderInvoicingCarActivity extends BaseStatusActivity<InvoicePresent
} else { } else {
mAdapter.addData(bean.getData().getData()); mAdapter.addData(bean.getData().getData());
mAdapter.loadMoreComplete(); mAdapter.loadMoreComplete();
} };
getCountSelectData(); getCountSelectData();
if (mAdapter.getData().size() != mAdapter.getSelectItem().size()) { if (mAdapter.getData().size() != mAdapter.getSelectItem().size()) {
cbAll.setChecked(false); cbAll.setChecked(false);
......
...@@ -34,6 +34,33 @@ android { ...@@ -34,6 +34,33 @@ android {
interior { interior {
} }
huawei {
}
xiaomi {
}
vivo {
}
oppo {
}
meizu {
}
yingyoungbao {
}
baidu {
}
rv360 {
}
wandoujia {
}
} }
} }
......
...@@ -42,6 +42,33 @@ android { ...@@ -42,6 +42,33 @@ android {
} }
interior { interior {
} }
huawei {
}
xiaomi {
}
vivo {
}
oppo {
}
meizu {
}
yingyoungbao {
}
baidu {
}
rv360 {
}
wandoujia {
}
} }
} }
......
...@@ -35,6 +35,33 @@ android { ...@@ -35,6 +35,33 @@ android {
interior { interior {
} }
huawei {
}
xiaomi {
}
vivo {
}
oppo {
}
meizu {
}
yingyoungbao {
}
baidu {
}
rv360 {
}
wandoujia {
}
} }
} }
......
...@@ -43,6 +43,33 @@ android { ...@@ -43,6 +43,33 @@ android {
interior { interior {
} }
huawei {
}
xiaomi {
}
vivo {
}
oppo {
}
meizu {
}
yingyoungbao {
}
baidu {
}
rv360 {
}
wandoujia {
}
} }
} }
......
...@@ -42,6 +42,33 @@ android { ...@@ -42,6 +42,33 @@ android {
interior { interior {
} }
huawei {
}
xiaomi {
}
vivo {
}
oppo {
}
meizu {
}
yingyoungbao {
}
baidu {
}
rv360 {
}
wandoujia {
}
} }
} }
......
...@@ -39,6 +39,33 @@ android { ...@@ -39,6 +39,33 @@ android {
interior { interior {
} }
huawei {
}
xiaomi {
}
vivo {
}
oppo {
}
meizu {
}
yingyoungbao {
}
baidu {
}
rv360 {
}
wandoujia {
}
} }
} }
......
...@@ -32,6 +32,33 @@ android { ...@@ -32,6 +32,33 @@ android {
} }
interior { interior {
} }
huawei {
}
xiaomi {
}
vivo {
}
oppo {
}
meizu {
}
yingyoungbao {
}
baidu {
}
rv360 {
}
wandoujia {
}
} }
compileOptions { compileOptions {
sourceCompatibility = '1.8' sourceCompatibility = '1.8'
......
...@@ -46,6 +46,33 @@ android { ...@@ -46,6 +46,33 @@ android {
interior { interior {
} }
huawei {
}
xiaomi {
}
vivo {
}
oppo {
}
meizu {
}
yingyoungbao {
}
baidu {
}
rv360 {
}
wandoujia {
}
} }
compileOptions { compileOptions {
sourceCompatibility = 1.8 sourceCompatibility = 1.8
......
...@@ -43,6 +43,33 @@ android { ...@@ -43,6 +43,33 @@ android {
interior { interior {
} }
huawei {
}
xiaomi {
}
vivo {
}
oppo {
}
meizu {
}
yingyoungbao {
}
baidu {
}
rv360 {
}
wandoujia {
}
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment