Browse Source

正式版本5.9.3【重点解决华为机型更新失败的问题,解析包错误】初步排查是so文件的问题。5.9.1版本没有添加完整的so文件的,但是没有出现下载解析包错误,所以需要与5.9.1版本做代码对比测试。

Arison 8 years ago
parent
commit
00a047884c

+ 1 - 1
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/secretary/BookingAddActivity.java

@@ -83,7 +83,7 @@ public class BookingAddActivity extends OABaseActivity implements HttpImp, View.
     GridDataAdapter adapter;
     GridDataAdapter adapter;
 
 
 
 
-    private String[] mTypes = {"商务洽谈", "开会", "外出娱乐", "吃饭", "卡拉OK", "其它"};
+    private String[] mTypes =  {"商务洽谈", "开会", "外出娱乐", "吃饭", "卡拉OK", "高尔夫","麻将","电影","其它" };
     private String phone;
     private String phone;
 
 
     @Override
     @Override

+ 0 - 13
app_core/common/src/main/java/com/core/app/MyApplication.java

@@ -219,21 +219,8 @@ public class MyApplication extends BaseApplication {
         }
         }
         // 清除图片加载
         // 清除图片加载
         ImageLoader.getInstance().destroy();
         ImageLoader.getInstance().destroy();
-        //
         releaseFastVolley();
         releaseFastVolley();
-        // 释放数据库
-        // SQLiteHelper.release();
         android.os.Process.killProcess(android.os.Process.myPid());
         android.os.Process.killProcess(android.os.Process.myPid());
-
-        //TODO 获取此刻精确时间并转换为yyyy-MM-dd HH:mm:ss
-//        String nowtime = TimeUtils.f_long_2_str(System.currentTimeMillis());
-//        String saved_time = PreferenceUtils.getString(MyApplication.getInstance(), TimeStatisticsActivity.Killed);
-//
-//        if (!TextUtils.isEmpty(saved_time)) {
-//            PreferenceUtils.putString(TimeStatisticsActivity.Killed, saved_time + "," + nowtime);
-//        } else {
-//            PreferenceUtils.putString(TimeStatisticsActivity.Killed, nowtime);
-//        }
     }
     }
 
 
     private void initErpDB() {
     private void initErpDB() {

+ 0 - 1
app_core/network/src/main/java/com/me/network/app/http/HttpClient.java

@@ -120,7 +120,6 @@ public class HttpClient {
         public Builder() {
         public Builder() {
             this.method = Method.GET;
             this.method = Method.GET;
             this.params.put("client","Android Client");
             this.params.put("client","Android Client");
-            this.headers.put("Content-Type","application/x-www-form-urlencoded;charset=UTF-8");
         }
         }
 
 
         public Builder(String url) {
         public Builder(String url) {

+ 7 - 15
app_core/network/src/main/java/com/me/network/app/http/interceptor/LogInterceptor.java

@@ -5,6 +5,7 @@ import com.common.LogUtil;
 import com.me.network.app.http.HttpClient;
 import com.me.network.app.http.HttpClient;
 
 
 import java.io.IOException;
 import java.io.IOException;
+import java.net.URLDecoder;
 import java.util.HashMap;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Map;
 
 
@@ -29,8 +30,8 @@ public class LogInterceptor implements Interceptor {
 	@Override
 	@Override
 	public Response intercept(Chain chain) throws IOException {
 	public Response intercept(Chain chain) throws IOException {
 		  Request request = chain.request();
 		  Request request = chain.request();
-		  Map<String, Object> headers;
-		  Map<String, Object> params;
+		  Map<String, Object> headers=new HashMap<>();
+		  Map<String, Object> params=new HashMap<>();
 		  Map<String,Object> postParam=new HashMap<>();
 		  Map<String,Object> postParam=new HashMap<>();
 		  //添加公共Header,公共参数
 		  //添加公共Header,公共参数
 		  if (builder!=null) {
 		  if (builder!=null) {
@@ -78,20 +79,11 @@ public class LogInterceptor implements Interceptor {
 		  Response response = chain.proceed(request);
 		  Response response = chain.proceed(request);
 		  okhttp3.MediaType mediaType = response.body().contentType();
 		  okhttp3.MediaType mediaType = response.body().contentType();
           String content = response.body().string();
           String content = response.body().string();
-		
          if (builder.isDebug()) {
          if (builder.isDebug()) {
-			/* Logger.init("PRETTYLOGGER")
-					 .hideThreadInfo()
-					 .methodCount(0);
-			 Logger.i("url:" + JSON.toJSONString(response.request().url().toString()));
-			 Logger.i("headers:"+ JSON.toJSONString(response.request().headers().toMultimap()));
-			 Logger.i("params:" + JSON.toJSONString(postParam));
-			 Logger.init("PRETTYLOGGER")
-					 .methodCount(1);*/
-			 LogUtil.d("HttpLogs","URL:" + JSON.toJSONString(response.request().url().toString()));
-			 LogUtil.d("HttpLogs","HEADER:"+ JSON.toJSONString(response.request().headers().toMultimap()));
-			 LogUtil.d("HttpLogs","PARAMS:" + JSON.toJSONString(postParam));
-			 LogUtil.d("HttpLogs","TEXT:" + content);
+			 LogUtil.d("HttpLogs","接口URL:" + JSON.toJSONString(response.request().url().toString()));
+			 LogUtil.d("HttpLogs","请求头:"+ JSON.toJSONString(response.request().headers().toMultimap()));
+			 LogUtil.d("HttpLogs","参数:" + URLDecoder.decode(postParam.toString(),"UTF-8"));
+			 LogUtil.d("HttpLogs","返回结果:" + content);
 		}
 		}
     
     
 		return response.newBuilder()
 		return response.newBuilder()

+ 1 - 1
app_modular/appbooking/src/main/java/com/modular/booking/activity/business/BBookingAddActivity.java

@@ -81,7 +81,7 @@ public class BBookingAddActivity extends OABaseActivity implements View.OnClickL
     List<DataState> dataStates;
     List<DataState> dataStates;
     GridDataAdapter adapter;
     GridDataAdapter adapter;
     private String phone;
     private String phone;
-    private String[] mTypes = {"商务洽谈", "开会", "外出娱乐", "吃饭", "卡拉OK", "其它" };
+    private String[] mTypes = {"商务洽谈", "开会", "外出娱乐", "吃饭", "卡拉OK", "高尔夫","麻将","电影","其它" };
 
 
 
 
     @Override
     @Override

+ 3 - 2
app_modular/appcontact/src/main/java/com/uas/appcontact/ui/activity/ContactsActivity.java

@@ -889,8 +889,9 @@ public class ContactsActivity extends OABaseActivity implements ContactsAdapter.
                             "},");
                             "},");
                 }
                 }
             }
             }
-           LogUtil.prinlnLongMsg("HttpLogs",mapBuilder.toString());
+         
             HttpClient httpClient = new HttpClient.Builder().url(Constants.IM_BASE_URL)
             HttpClient httpClient = new HttpClient.Builder().url(Constants.IM_BASE_URL)
+                    .add("comParam","param")
                     .isDebug(true).build(true);
                     .isDebug(true).build(true);
             httpClient.Api().send(new HttpClient.Builder()
             httpClient.Api().send(new HttpClient.Builder()
                     .url("/user/appMobileContact")
                     .url("/user/appMobileContact")
@@ -899,7 +900,7 @@ public class ContactsActivity extends OABaseActivity implements ContactsAdapter.
                     .add("username", MyApplication.getInstance().mLoginUser.getNickName())
                     .add("username", MyApplication.getInstance().mLoginUser.getNickName())
                     .add("map", mapBuilder.toString())
                     .add("map", mapBuilder.toString())
                     .method(Method.POST)
                     .method(Method.POST)
-                    .build(false), new ResultSubscriber<>(new ResultListener<Object>() {
+                    .build(), new ResultSubscriber<>(new ResultListener<Object>() {
 
 
                 @Override
                 @Override
                 public void onResponse(Object o) {
                 public void onResponse(Object o) {

+ 3 - 3
version.gradle

@@ -11,8 +11,8 @@ ext {
             minSdkVersion    : 9,
             minSdkVersion    : 9,
             targetSdkVersion : 24,
             targetSdkVersion : 24,
             javaVersion      : JavaVersion.VERSION_1_8,
             javaVersion      : JavaVersion.VERSION_1_8,
-            versionCode      : 115,
-            versionName      : '5.9.3',
+            versionCode      : 114,
+            versionName      : '5.9.2',
     ]
     ]
 
 
     depsVersion = [
     depsVersion = [
@@ -26,7 +26,7 @@ ext {
             rxAndroidVersion        : '1.2.1',
             rxAndroidVersion        : '1.2.1',
             okhttpVersion           : '3.4.1',
             okhttpVersion           : '3.4.1',
             retrofitVersion         : '2.1.0',
             retrofitVersion         : '2.1.0',
-            stethoVersion           : '1.4.1',
+            stethoVersion           : '1.5.0',
             glideVersion            : '3.8.0',
             glideVersion            : '3.8.0',
             supertoastsVersion      : '2.0',
             supertoastsVersion      : '2.0',
             alerterVersion          : '1.0.6',
             alerterVersion          : '1.0.6',