1 刷新动画时间更改，信息界面本地图片圆角处理

WeiChat/src/main/java/com/xzjmyk/pm/activity/CommonWebviewActivity.java

@@ -50,8 +50,12 @@ public class CommonWebviewActivity extends Activity {
             public void onDownloadStart(final String url, String userAgent, String contentDisposition, String mimetype, long contentLength) {
                 Log.d("weburl",url);
                 String fileName = url.substring(url.lastIndexOf("/") + 1);
+                
+                fileName=fileName.split("&")[3].split("=")[1];
 
-                new AlertDialog.Builder(CommonWebviewActivity.this).setTitle("提示").setMessage("确定下载文件<"+fileName+">吗?").setNegativeButton(R.string.cancel, null)
+                new AlertDialog.Builder(CommonWebviewActivity.this)
+                        .setTitle("提示").setMessage("确定下载文件"+fileName+"吗?")
+                        .setNegativeButton(R.string.cancel, null)
                         .setPositiveButton(R.string.sure, new DialogInterface.OnClickListener() {
                             @Override
                             public void onClick(DialogInterface dialog, int which) {

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/util/CommonUtil.java

@@ -1089,6 +1089,7 @@ public class CommonUtil {
 //	              /*如果无法直接打开，就跳出软件列表给用户选择 */
             type = "*/*";
         }
+        LogUtil.d("下载文件类型："+type);
         return type;
     }
 

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/me/MeFragment.java

@@ -37,7 +37,6 @@ import com.xzjmyk.pm.activity.ui.MainActivity;
 import com.xzjmyk.pm.activity.ui.base.EasyFragment;
 import com.xzjmyk.pm.activity.ui.circle.BusinessCircleActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.BaseInfoActivity;
-import com.xzjmyk.pm.activity.ui.erp.activity.form.DataFormDetailActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.TestActivity;
 import com.xzjmyk.pm.activity.ui.erp.model.Master;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
@@ -336,9 +335,9 @@ public class MeFragment extends EasyFragment implements View.OnClickListener {
                 startActivity(new Intent(getActivity(), LocalVideoActivity.class));
                 break;
             case R.id.setting_rl:// 设置
-               startActivity(new Intent(getActivity(), DataFormDetailActivity.class));
+              // startActivity(new Intent(getActivity(), DataFormDetailActivity.class));
                // startActivity(new Intent(getActivity(), DataFormFieldActivity.class));
-               //startActivity(new Intent(getActivity(), SettingActivity.class));
+               startActivity(new Intent(getActivity(), SettingActivity.class));
                 break;
             case R.id.app_scan_code_rl://APP二维码
                 ImageView imageView = new ImageView(getActivity());

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/message/MessageFragment.java

@@ -586,21 +586,21 @@ public class MessageFragment extends EasyFragment {
             TextView delete_tv = ViewHolder.get(convertView, R.id.delete_tv);
 
             final Friend friend = mFriendList.get(position).getBean();
-            avatar_img.setBackgroundResource(R.color.gray_light);
+            avatar_img.setBackgroundResource(R.color.transparent);
             if (friend.getRoomFlag() == 0) {// 这是单个人
 
                 if (isRefeshed) {
                     AvatarHelper.getInstance().display(friend.getUserId(), avatar_img, false, true);//每次刷新都会去删除此人缓存
                     isRefeshed = false;
                 } else {
-                    AvatarHelper.getInstance().displayAvatar(friend.getUserId(), avatar_img, false);
+                    AvatarHelper.getInstance().displayAvatar(friend.getUserId(), avatar_img, true);
                 }
 
             } else {
                 if (TextUtils.isEmpty(friend.getRoomCreateUserId())) {
                     avatar_img.setImageResource(R.drawable.qunliao);
                 } else {
-                    AvatarHelper.getInstance().displayAvatarPng(friend.getRoomCreateUserId(), avatar_img, false);// 目前在备注名放房间的创建者Id
+                    AvatarHelper.getInstance().displayAvatarPng(friend.getRoomCreateUserId(), avatar_img, true);// 目前在备注名放房间的创建者Id
                 }
             }
             nick_name_tv.setText(friend.getRemarkName() != null ? friend.getRemarkName() : friend.getNickName());

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/message/uas/B2bMsgActivity.java

@@ -2,19 +2,16 @@ package com.xzjmyk.pm.activity.ui.message.uas;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
-import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.IntentFilter;
-import android.os.Handler;
-import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
+import android.os.Handler;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.AdapterView;
 import android.widget.BaseAdapter;
-import android.widget.Button;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.ListView;
@@ -26,17 +23,15 @@ import com.handmark.pulltorefresh.library.PullToRefreshBase;
 import com.handmark.pulltorefresh.library.PullToRefreshListView;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
+import com.xzjmyk.pm.activity.CommonWebviewActivity;
 import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.bean.crm.Business;
 import com.xzjmyk.pm.activity.broadcast.MsgBroadcast;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
-import com.xzjmyk.pm.activity.ui.erp.activity.crm.BusinessDetailInfoActivity;
 import com.xzjmyk.pm.activity.ui.erp.db.DBManager;
 import com.xzjmyk.pm.activity.ui.erp.entity.B2BMsg;
-import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.ListUtils;
-import com.xzjmyk.pm.activity.ui.erp.view.MasterDialog;
+import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -142,6 +137,18 @@ public class B2bMsgActivity extends BaseActivity {
                     }
                 });
                 refreshUi();
+           
+                Intent intent = new Intent();
+                intent.setClass(mContext, CommonWebviewActivity.class);
+                try {
+                    if(!StringUtils.isEmpty(holder.tv_content.getText().toString())){
+                        intent.putExtra("scan_url", holder.tv_content.getText().toString().split("#")[1]);
+                        Log.d("image_url", holder.tv_content.getText().toString().split("#")[1]);
+                        startActivity(intent);
+                    }
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
 //                startActivity(new Intent(BusinessDetailActivty.this, BusinessDetailInfoActivity.class));
             }
         });

WeiChat/src/main/java/com/xzjmyk/pm/activity/util/DownloadUtil.java

@@ -13,6 +13,7 @@ import android.os.Build;
 import android.os.Environment;
 
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
+import com.xzjmyk.pm.activity.ui.erp.util.LogUtil;
 
 import java.io.File;
 import java.net.URLDecoder;
@@ -58,6 +59,7 @@ public class DownloadUtil {
          * 截取文件名
          */
         String fileName = url.substring(url.lastIndexOf("/") + 1);
+        fileName=fileName.split("&")[3].split("=")[1];
         fileName = URLDecoder.decode(fileName);
          /*
          *系统下载服务类
@@ -71,6 +73,7 @@ public class DownloadUtil {
         down.setDestinationInExternalPublicDir(path + "/", fileName);
         //文件路径
         FilePath = file + "/" + fileName;
+        LogUtil.d("文件下载路径："+FilePath);
         //加入下载队列执行
         downManager.enqueue(down);
     }

WeiChat/src/main/res/layout/row_nearly_message.xml

@@ -22,7 +22,7 @@
             android:layout_gravity="center_vertical"
             android:padding="1dp"
             android:contentDescription="@string/app_name"
-            android:background="@color/gray_light"
+            android:background="@null"
             android:src="@drawable/avatar_normal" />
 
         <TextView

pullToRefershLibraryMy/src/main/java/com/handmark/pulltorefresh/library/internal/RotateLoadingLayout.java

@@ -29,7 +29,7 @@ import com.handmark.pulltorefresh.library.R;
 
 public class RotateLoadingLayout extends LoadingLayout {
 
-	static final int ROTATION_ANIMATION_DURATION = 1200;
+	static final int ROTATION_ANIMATION_DURATION = 500;
 
 	private final Animation mRotateAnimation;
 	private final Matrix mHeaderImageMatrix;