上传新路交arr包
This commit is contained in:
parent
182b08ac4f
commit
55ae6f863f
@ -4,6 +4,7 @@
|
||||
<component name="GradleSettings">
|
||||
<option name="linkedExternalProjectsSettings">
|
||||
<GradleProjectSettings>
|
||||
<option name="testRunner" value="CHOOSE_PER_TEST" />
|
||||
<option name="externalProjectPath" value="$PROJECT_DIR$" />
|
||||
<option name="gradleJvm" value="#JAVA_HOME" />
|
||||
<option name="modules">
|
||||
|
||||
@ -95,7 +95,8 @@ android {
|
||||
//暂时填写默认值即可.
|
||||
JPUSH_CHANNEL: "developer-n"]
|
||||
buildConfigField("String", "OPEN_AL_URL", "\"https://oapi-staging.alct56.com\"")
|
||||
buildConfigField("String", "BASE_URL", "\"http://192.168.1.118:18080/\"")
|
||||
buildConfigField("String", "BASE_URL", "\"http://192.168.1.118:8082/devApi/\"")
|
||||
// buildConfigField("String", "BASE_URL", "\"http://192.168.1.118:8080/devApi/\"")
|
||||
// buildConfigField("String", "BASE_URL", "\"http://platform.test.v2.dahehuoyun.com/devApi/\"")
|
||||
buildConfigField "boolean", "isTest", "true"
|
||||
//APP名称，可以在androidMainfest中引用
|
||||
@ -197,4 +198,7 @@ dependencies {
|
||||
// implementation 'com.umeng.umsdk:push:6.6.3'// 必选
|
||||
|
||||
implementation 'cn.jiguang.sdk:jpush:5.3.1'
|
||||
|
||||
|
||||
implementation files('libs/mdp-release.aar')
|
||||
}
|
||||
BIN
app/libs/mdp-release.aar
Normal file
BIN
app/libs/mdp-release.aar
Normal file
Binary file not shown.
@ -31,7 +31,6 @@ class RequestHeadInterceptor : Interceptor {
|
||||
.addHeader("versionValue", AppUtils.getAppVersionName() + "")
|
||||
.addHeader("deviceType", "ANDROID")
|
||||
.addHeader("language", BaseUtils.getLanguage(App.app).toString() + "")
|
||||
.addHeader("Authorization","""Bearer ${SPUtils.instance.getUserToken(App.app)}""")
|
||||
.build()
|
||||
Log.i(TAG, "intercept: " + request.headers)
|
||||
return chain.proceed(request)
|
||||
|
||||
@ -4,6 +4,7 @@ import android.content.ContentResolver;
|
||||
import android.database.Cursor;
|
||||
import android.graphics.Bitmap;
|
||||
import android.net.Uri;
|
||||
import android.os.Build;
|
||||
import android.provider.MediaStore;
|
||||
import android.util.Log;
|
||||
import android.widget.ImageView;
|
||||
@ -24,6 +25,7 @@ import com.alibaba.sdk.android.oss.internal.OSSAsyncTask;
|
||||
import com.alibaba.sdk.android.oss.model.OSSRequest;
|
||||
import com.alibaba.sdk.android.oss.model.PutObjectRequest;
|
||||
import com.alibaba.sdk.android.oss.model.PutObjectResult;
|
||||
import com.arpa.hndahesudintocctmsdriver.BuildConfig;
|
||||
import com.arpa.hndahesudintocctmsdriver.base.App;
|
||||
import com.arpa.mylibrary.utils.LoadingUtils;
|
||||
import com.arpa.mylibrary.utils.TimeUtil;
|
||||
@ -81,7 +83,8 @@ public class OssServiceUtil {
|
||||
//初始化使用参数
|
||||
public void init() {
|
||||
bucket = OssConfigBean.bucket;
|
||||
String stsServer = "http://platform.test.v2.dahehuoyun.com/devApi/file/aliyun/oss/getToken";
|
||||
// String stsServer = "http://platform.test.v2.dahehuoyun.com/devApi/file/aliyun/oss/getToken";
|
||||
String stsServer = BuildConfig.BASE_URL+ "file/aliyun/oss/getToken";
|
||||
credentialProvider = new OSSAuthCredentialsProvider(stsServer);
|
||||
conf = new ClientConfiguration();
|
||||
conf.setConnectionTimeout(15 * 1000); // 连接超时，默认15秒
|
||||
|
||||
@ -70,9 +70,9 @@ class HomeActivity : BaseActivity<ActivityHomeBinding>(), OnTabSelectListener,
|
||||
addOnPageChangeListener(this@HomeActivity)
|
||||
offscreenPageLimit = 3
|
||||
}
|
||||
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
|
||||
getPermissions()
|
||||
}
|
||||
// if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
|
||||
// getPermissions()
|
||||
// }
|
||||
|
||||
|
||||
}
|
||||
|
||||
@ -14,6 +14,7 @@ import com.arpa.hndahesudintocctmsdriver.databinding.ActivityLauncherBinding
|
||||
import com.arpa.hndahesudintocctmsdriver.third.JTTProcess
|
||||
import com.arpa.hndahesudintocctmsdriver.third.SPUtil
|
||||
import com.arpa.hndahesudintocctmsdriver.ui.account.LoginActivity
|
||||
import com.arpa.hndahesudintocctmsdriver.ui.account.SelectRoleActivity
|
||||
import com.arpa.hndahesudintocctmsdriver.utils.CommonPopUtils
|
||||
import com.arpa.hndahesudintocctmsdriver.utils.SPUtils
|
||||
import com.arpa.mylibrary.base.BaseActivity
|
||||
@ -35,17 +36,18 @@ class LauncherActivity : BaseActivity<ActivityLauncherBinding>() {
|
||||
//已登录，直接跳转首页
|
||||
//
|
||||
if (!SPUtils.instance.getUserToken(mContext).isNullOrEmpty()) {
|
||||
// val userInfo = SPUtils.instance.getUserInfo(mContext)
|
||||
// if (userInfo?.isCarCaptain == "9") {//是否是车队长（0=否,1=是,9=未选择）
|
||||
// ActivityUtils.startActivity(
|
||||
// mContext,
|
||||
// SelectRoleActivity::class.java
|
||||
// )
|
||||
// } else {
|
||||
// ActivityUtils.startActivity(mContext, HomeActivity::class.java, intent.extras)
|
||||
// }
|
||||
ActivityUtils.startActivity(mContext, HomeActivity::class.java, intent.extras)
|
||||
val userInfo = SPUtils.instance.getUserInfo(mContext)
|
||||
if (userInfo?.isCarCaptain == "9") {//是否是车队长（0=否,1=是,9=未选择）
|
||||
ActivityUtils.startActivity(
|
||||
mContext,
|
||||
SelectRoleActivity::class.java
|
||||
)
|
||||
} else {
|
||||
ActivityUtils.startActivity(mContext, HomeActivity::class.java, intent.extras)
|
||||
}
|
||||
// ActivityUtils.startActivity(mContext, HomeActivity::class.java, intent.extras)
|
||||
} else {
|
||||
// ActivityUtils.startActivity(this@LauncherActivity, HomeActivity::class.java)
|
||||
ActivityUtils.startActivity(this@LauncherActivity, LoginActivity::class.java)
|
||||
}
|
||||
// ActivityUtils.startActivity(this@LauncherActivity, LoginActivity::class.java)
|
||||
@ -122,16 +124,16 @@ class LauncherActivity : BaseActivity<ActivityLauncherBinding>() {
|
||||
//已登录，直接跳转首页
|
||||
//已登录，直接跳转首页
|
||||
if (!SPUtils.instance.getUserToken(mContext).isNullOrEmpty()) {
|
||||
// val userInfo = SPUtils.instance.getUserInfo(mContext)
|
||||
// if (userInfo?.isCarCaptain == "9") {//是否是车队长（0=否,1=是,9=未选择）
|
||||
// ActivityUtils.startActivity(
|
||||
// mContext,
|
||||
// SelectRoleActivity::class.java
|
||||
// )
|
||||
// } else {
|
||||
// ActivityUtils.startActivity(mContext, HomeActivity::class.java, intent.extras)
|
||||
// }
|
||||
ActivityUtils.startActivity(mContext, HomeActivity::class.java, intent.extras)
|
||||
val userInfo = SPUtils.instance.getUserInfo(mContext)
|
||||
if (userInfo?.isCarCaptain == "9") {//是否是车队长（0=否,1=是,9=未选择）
|
||||
ActivityUtils.startActivity(
|
||||
mContext,
|
||||
SelectRoleActivity::class.java
|
||||
)
|
||||
} else {
|
||||
ActivityUtils.startActivity(mContext, HomeActivity::class.java, intent.extras)
|
||||
}
|
||||
// ActivityUtils.startActivity(mContext, HomeActivity::class.java, intent.extras)
|
||||
} else {
|
||||
ActivityUtils.startActivity(
|
||||
this@LauncherActivity,
|
||||
|
||||
@ -266,7 +266,7 @@ public class H5Activity extends AppCompatActivity {
|
||||
}
|
||||
return true;
|
||||
} else if (url.startsWith(SCHEMA_REAL)) {
|
||||
//esign://app/realBack&serviceId=854677892133554052&verifycode=4a52e2af0d0abfb7b285c4f05b5af133&status=true&passed=true
|
||||
//esign://demo/realBack://app/realBack&serviceId=854677892133554052&verifycode=4a52e23&status=true&passed=true
|
||||
|
||||
//实名结果
|
||||
if (uri.getQueryParameter("verifycode") != null) {
|
||||
|
||||
@ -41,6 +41,7 @@ import com.arpa.mylibrary.net.CommonResponseBean
|
||||
import com.arpa.mylibrary.recycleviewswipe.RecycleViewDivider
|
||||
import com.arpa.mylibrary.utils.ActivityUtils
|
||||
import com.arpa.mylibrary.utils.ConvertUtils
|
||||
import com.express.mdp.Api
|
||||
import com.permissionx.guolindev.PermissionX
|
||||
import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
|
||||
import io.reactivex.rxjava3.schedulers.Schedulers
|
||||
@ -79,6 +80,7 @@ class HomeFragment : BaseFragment<FragmentHomeBinding>(), RefreshCallBack {
|
||||
|
||||
|
||||
override fun onFragmentFirstVisible() {
|
||||
Api.stopLocationService()
|
||||
initRecy()
|
||||
setRefresh(binding.refresh, this)
|
||||
binding.run {
|
||||
|
||||
@ -65,10 +65,10 @@ class CommonPopUtils private constructor() {
|
||||
.dismissOnTouchOutside(false)
|
||||
.asCustom(
|
||||
AgreementAlert(
|
||||
context, "http://192.168.1.152:8088/",
|
||||
context, "https://agreement.dahehuoyun.com/currency/#/",
|
||||
// context, "file:///android_asset/web/htpdf.html",
|
||||
// context, "http://agreement.dahehuoyun.com/huawei/#/private",
|
||||
"http://agreement.dahehuoyun.com/#/user", listener
|
||||
"https://agreement.dahehuoyun.com/currency/#/", listener
|
||||
)
|
||||
)
|
||||
.show()
|
||||
|
||||
@ -30,15 +30,16 @@
|
||||
android:layout_height="wrap_content"
|
||||
android:text="3"
|
||||
android:textColor="@color/color_3"
|
||||
android:textSize="18dp"></TextView>
|
||||
android:textSize="18dp" />
|
||||
|
||||
<TextView
|
||||
android:layout_marginLeft="3dp"
|
||||
android:layout_marginStart="3dp"
|
||||
android:layout_marginTop="2dp"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="跳过"
|
||||
android:textColor="@color/color_9"
|
||||
android:textSize="12dp"></TextView>
|
||||
android:textSize="12dp" />
|
||||
</LinearLayout>
|
||||
|
||||
</RelativeLayout>
|
||||
Loading…
Reference in New Issue
Block a user