From 2d6fd6d38208257edfd4fa0552424e7a89bb2479 Mon Sep 17 00:00:00 2001
From: 18034727885 <973609879@qq.com>
Date: 星期二, 18 八月 2026 11:10:06 +0800
Subject: [PATCH] 修复问题
---
app/src/main/java/com/driver/igotrip/ui/mine/MineActivity.kt | 34 ++++++----------
app/src/main/java/com/driver/igotrip/netUtls/HttpManager.java | 39 ++++---------------
2 files changed, 21 insertions(+), 52 deletions(-)
diff --git a/app/src/main/java/com/driver/igotrip/netUtls/HttpManager.java b/app/src/main/java/com/driver/igotrip/netUtls/HttpManager.java
index 04a7f3f..b146d0d 100644
--- a/app/src/main/java/com/driver/igotrip/netUtls/HttpManager.java
+++ b/app/src/main/java/com/driver/igotrip/netUtls/HttpManager.java
@@ -43,39 +43,16 @@
*/
public class HttpManager {
- private static HttpManager httpManager;
private final ApiServics service = initBaseData().create(ApiServics.class);
private Gson gson;
- private Map<String, String> headerParams;
- private HashMap<String, Object> map;
+ private final Map<String, String> headerParams = new HashMap<>();
+
+ private static final class HttpManagerHolder {
+ private static final HttpManager httpManager = new HttpManager();
+ }
public static synchronized HttpManager getInstance() {
- if (httpManager == null) synchronized (HttpManager.class) {
- if (httpManager == null) {
- httpManager = new HttpManager();
- }
- }
- return httpManager;
- }
-
-
- /**
- * 初始化请求头，具体情况根据需求设置
- */
- public void initHeader() {
- headerParams = new HashMap<>();
- map = new HashMap<>();
- // 传参方式为json
-// headerParams.put("Content-Type", "application/json");
- headerParams.put("Authorization", "Bearer " + getToken());
- }
-
- public HashMap<String, Object> getMap() {
- if (map == null) {
- map = new HashMap<>();
- }
- map.clear();
- return map;
+ return HttpManagerHolder.httpManager;
}
private static String bodyToString(final RequestBody request) {
@@ -98,7 +75,6 @@
*
*/
private Retrofit initBaseData() {
- initHeader();
// 监听请求条件
OkHttpClient.Builder builder = new OkHttpClient.Builder();
builder.connectTimeout(3, TimeUnit.MINUTES);
@@ -149,7 +125,7 @@
}
Log.i("zzz", "request====" + new JSONObject(params));
-
+ headerParams.put("Authorization", "Bearer " + getToken());
// getService.getResult(action.substring(action.lastIndexOf("/") + 1), headerParams, params)
service.getResult(action, headerParams, params)
.subscribeOn(Schedulers.io())
@@ -199,6 +175,7 @@
int type = getTypeByLanguage();
params.put(Const.language, type); // 1 中文 2 英文 3 法文
LogUtils.d("post", params.toString());
+ headerParams.put("Authorization", "Bearer " + getToken());
return service.postResult(action, headerParams, params);
}
diff --git a/app/src/main/java/com/driver/igotrip/ui/mine/MineActivity.kt b/app/src/main/java/com/driver/igotrip/ui/mine/MineActivity.kt
index 1ddf11e..2281a67 100644
--- a/app/src/main/java/com/driver/igotrip/ui/mine/MineActivity.kt
+++ b/app/src/main/java/com/driver/igotrip/ui/mine/MineActivity.kt
@@ -1,12 +1,13 @@
package com.driver.igotrip.ui.mine
+//import com.umeng.socialize.ShareAction
+//import com.umeng.socialize.ShareContent
+//import com.umeng.socialize.UMShareListener
+//import com.umeng.socialize.bean.SHARE_MEDIA
+//import com.umeng.socialize.media.UMImage
+//import com.umeng.socialize.media.UMWeb
import android.app.Activity
-import android.content.Intent
-import android.content.pm.PackageInfo
-import android.content.pm.PackageManager
import android.net.Uri
-import android.util.Base64
-import android.util.Log
import android.view.View
import android.widget.ImageView
import android.widget.TextView
@@ -17,14 +18,11 @@
import cn.sinata.xldutils.utils.getFormatTwo
import com.driver.igotrip.R
import com.driver.igotrip.base.BaseEvent
-import com.driver.igotrip.base.BaseEvent.REFREASH_ORDERLIST
import com.driver.igotrip.base.MyApplication
import com.driver.igotrip.base.MyBaseActivity
import com.driver.igotrip.bean.UserBean
import com.driver.igotrip.bean.UserInfoBean
import com.driver.igotrip.netUtls.Api
-import com.driver.igotrip.netUtls.Api.strShare
-import com.driver.igotrip.netUtls.HttpManager
import com.driver.igotrip.netUtls.callNet
import com.driver.igotrip.netUtls.getMapByAny
import com.driver.igotrip.ui.DialogUtil
@@ -42,19 +40,10 @@
import com.facebook.share.model.ShareLinkContent
import com.facebook.share.widget.ShareDialog
import com.twitter.sdk.android.tweetcomposer.TweetComposer
-//import com.umeng.socialize.ShareAction
-//import com.umeng.socialize.ShareContent
-//import com.umeng.socialize.UMShareListener
-//import com.umeng.socialize.bean.SHARE_MEDIA
-//import com.umeng.socialize.media.UMImage
-//import com.umeng.socialize.media.UMWeb
import org.greenrobot.eventbus.EventBus
import org.jetbrains.anko.find
import org.jetbrains.anko.startActivity
-import org.jetbrains.anko.toast
import java.net.URL
-import java.security.MessageDigest
-import java.security.NoSuchAlgorithmException
class MineActivity : MyBaseActivity() {
override fun setContentView() {
@@ -98,7 +87,7 @@
callMine()
}
- lateinit var data: UserInfoBean
+ private var data: UserInfoBean? = null
private val iv_head by lazy { find<ImageView>(R.id.iv_head) }
@@ -129,7 +118,8 @@
this.data = it
GlideUtil.loady(MyApplication.getInstance(), it.avatar, iv_head)
val name = "${it.firstName} ${it.lastName} ${it.licensePlate}"
- tv_name.text = SpanBuilder.content(name).boldSpan(this,0,name.indexOf(it.licensePlate)).sizeSpan(0,name.indexOf(it.licensePlate),14).build()
+ tv_name.text =
+ SpanBuilder.content(name).boldSpan(this, 0, name.indexOf(it.licensePlate)).sizeSpan(0, name.indexOf(it.licensePlate), 14).build()
tv_company.text = it.brand
tv_order_num.text = it.orderNum
tv_star.text = getFormatOne(it.score)
@@ -156,7 +146,9 @@
}
rl_mine_eval.setOnClickListener {
- startActivity<MineEvalActivity>("score" to data.score.toString())
+ data?.also {
+ startActivity<MineEvalActivity>("score" to it.score.toString())
+ }
}
//账户安全
rl_acount_safe.setOnClickListener {
@@ -335,7 +327,7 @@
}
}
- fun shareX(act: Activity, url: String){
+ fun shareX(act: Activity, url: String) {
try {
val uri1 = "android.resource://" + act.packageName + "/mipmap-xxhdpi/ic_launcher.png"
val builder = TweetComposer.Builder(act)
--
Gitblit v1.7.1