update code #70461

README.md

@@ -1,6 +1,6 @@
 # Android平台5+App/uni-app运行环境开源项目
 
-**重要：请使用HBuilderX2.3.6-20191020生成本地打包App资源，否则uni-app项目可能提示“运行环境版本和编译器版本不一致”，详情参考[https://ask.dcloud.net.cn/article/35627](https://ask.dcloud.net.cn/article/35627)**
+**重要：请使用HBuilderX2.3.7-20191024生成本地打包App资源，否则uni-app项目可能提示“运行环境版本和编译器版本不一致”，详情参考[https://ask.dcloud.net.cn/article/35627](https://ask.dcloud.net.cn/article/35627)**
 
 ## 说明
 此次更新梳理了工程结构，现在开发者可以直接修改引擎中的代码，自主编译出新的引擎。

feature/share-weixin/src/io/dcloud/share/mm/WeiXinApiManager.java

@@ -8,13 +8,17 @@
 import android.graphics.Bitmap;
 import android.graphics.Bitmap.CompressFormat;
 import android.graphics.BitmapFactory;
+import android.graphics.Color;
+import android.graphics.drawable.ColorDrawable;
 import android.net.Uri;
 import android.os.Bundle;
 import android.text.TextUtils;
 import android.view.Display;
 import android.widget.Toast;
 
+import com.nostra13.dcloudimageloader.core.DisplayImageOptions;
 import com.nostra13.dcloudimageloader.core.ImageLoaderL;
+import com.nostra13.dcloudimageloader.core.assist.ImageScaleType;
 import com.tencent.mm.opensdk.modelbase.BaseResp;
 import com.tencent.mm.opensdk.modelbiz.WXLaunchMiniProgram;
 import com.tencent.mm.opensdk.modelmsg.SendMessageToWX;
@@ -829,7 +833,7 @@ private static Bitmap cpBitmap(Bitmap orgBitmap) {
         Bitmap tmp;
         while (orgBitmap.getHeight() * orgBitmap.getRowBytes() >= 32 * 1024) {
             tmp = Bitmap.createScaledBitmap(orgBitmap, orgBitmap.getWidth() * 2 / 3, orgBitmap.getHeight() * 2 / 3, true);
-	        orgBitmap.recycle();
+            orgBitmap.recycle();
             orgBitmap = tmp;
 
         }
@@ -844,7 +848,10 @@ private byte[] buildThumbData(IWebview pWebViewImpl, String thumeImgPath) {
         try {
 //			The thumeImg size should be within 32KB * 1024 = 32768
             if (PdrUtil.isNetPath(thumeImgPath)) {//是网络地址
-                bitmap=ImageLoaderL.getInstance().loadImageSync(thumeImgPath);
+                DisplayImageOptions displayImageOptions = new DisplayImageOptions.Builder()
+                        .cacheOnDisc(false).cacheInMemory(false).imageScaleType(ImageScaleType.NONE).bitmapConfig(Bitmap.Config.RGB_565)
+                        .showImageOnLoading(new ColorDrawable(Color.TRANSPARENT)).build();
+                bitmap=ImageLoaderL.getInstance().loadImageSync(thumeImgPath, displayImageOptions);
 //                try {
 //                    is = new URL(thumeImgPath).openStream();
 //                    if(is != null){

feature/uploader/src/io/dcloud/net/UploadNetWork.java

@@ -177,8 +177,8 @@ private void initUploadData() throws Exception{
 		mRequest.setRequestProperty("Charset", "UTF-8");
 		mRequest.setRequestProperty("Content-Type", "multipart/form-data; boundary=" + boundary);
 		mRequest.setUseCaches(false);
-		int maxBufferSize = 10 * 1024;
-		mRequest.setChunkedStreamingMode(maxBufferSize);
+		/*int maxBufferSize = 10 * 1024;
+		mRequest.setChunkedStreamingMode(maxBufferSize);*/
 		initContentLength();
 		DataOutputStream ds = new DataOutputStream(mRequest.getOutputStream());
 		//设置所有应该上传的数据
@@ -198,7 +198,7 @@ private void initUploadData() throws Exception{
 					ds.write(contentType.getBytes());
 					ds.writeBytes(end);
 					FileInputStream fStream = ((UploadFile) ui).mFileInputS;
-					int bytesAvailable = fStream.available();
+					/*int bytesAvailable = fStream.available();
 					int bufferSize = Math.min(bytesAvailable, maxBufferSize);
 					byte[] buffer = new byte[bufferSize];
                     long curbytes = 0;
@@ -212,6 +212,17 @@ private void initUploadData() throws Exception{
 						bytesAvailable = fStream.available();
 						bufferSize = Math.min(bytesAvailable, maxBufferSize);
 						bytesRead = fStream.read(buffer, 0, bufferSize);
+					}*/
+					int bufferSize = 1024*10;
+					byte[] buffer = new byte[bufferSize];
+					int length = -1;
+					long curbytes = 0;
+					while ((length = fStream.read(buffer)) != -1) {
+						curbytes += length;
+						mUploadedSize = curbytes;
+						Log.e("UploadNetWort", "initUploadData: mUploadedSize=="+mUploadedSize );
+						mReqListener.onNetStateChanged(NetState.NET_HANDLE_ING,isAbort);
+						ds.write(buffer, 0, length);
 					}
 					ds.writeBytes(end);
 					fStream.close();