Arison преди 9 години
родител
ревизия
8788841762

+ 1 - 1
WeiChat/build.gradle

@@ -4,7 +4,7 @@ apply plugin: 'com.getkeepsafe.dexcount'
 android {
     signingConfigs {
         config {
-            storeFile file('E:/CompanyProject/applicationsignname[20150409]')
+            storeFile file('C:/Users/Arison/Desktop/applicationsignname[20150409]')
             storePassword '13237658359'
             keyAlias 'jie-20150409'
             keyPassword '13237658359'

+ 4 - 3
WeiChat/src/main/AndroidManifest.xml

@@ -2,8 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     package="com.xzjmyk.pm.activity"
-    android:versionCode="54"
-    android:versionName="5.4" >
+    android:versionCode="55"
+    android:versionName="5.5" >
 
     <uses-sdk
         android:minSdkVersion="11"
@@ -587,7 +587,8 @@
         </activity>
         <activity android:name=".ui.erp.activity.me.UpdateSexActivity" >
         </activity>
-        <activity android:name=".ui.erp.activity.me.FeedbackActivity" >
+        <activity android:name=".ui.erp.activity.me.FeedbackActivity"
+            android:windowSoftInputMode="stateHidden|stateAlwaysHidden">
         </activity>
     </application>
 

+ 23 - 1
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/WebViewCommActivity.java

@@ -6,6 +6,8 @@ import android.content.Intent;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
+import android.view.Menu;
+import android.view.MenuItem;
 import android.view.View;
 import android.webkit.CookieManager;
 import android.webkit.CookieSyncManager;
@@ -46,7 +48,7 @@ public class WebViewCommActivity extends BaseActivity {
     private boolean isStartApp = false;
     private boolean isCookie;
     private int reCode = 201;
-    Handler hander = new Handler() {
+    private  Handler hander = new Handler() {
         @Override
         public void handleMessage(Message msg) {
             if (msg.what == reCode) {
@@ -223,4 +225,24 @@ public class WebViewCommActivity extends BaseActivity {
     }
 
 
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        getMenuInflater().inflate(R.menu.menu_about, menu);
+        return true;
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case R.id.app_about:
+                ToastMessage("分享");
+                break;
+            case android.R.id.home:
+                onBackPressed();
+                break;
+        }
+        return true;
+    }
+
+
 }

+ 1 - 1
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/crm/VisitReportAddActivity.java

@@ -238,7 +238,7 @@ public class VisitReportAddActivity extends BaseActivity implements View.OnClick
                             "\"vr_cuname\":\"" +
                             CommonUtil.getNoMarkEditText(tv_customer_login) +
                             "\",\n" +
-                            "\"vr_cucontact\":\"" +
+                            "\"vr_contact\":\"" +
                             CommonUtil.getNoMarkEditText(tv_linksman_login) +
                             "\",\n" +
                             "\"vr_title\":\"" +

+ 417 - 2
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/me/FeedbackActivity.java

@@ -1,19 +1,434 @@
 package com.xzjmyk.pm.activity.ui.erp.activity.me;
 
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.app.ProgressDialog;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.net.Uri;
+import android.os.AsyncTask;
 import android.os.Bundle;
+import android.text.TextUtils;
+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.EditText;
+import android.widget.ImageView;
+import android.widget.TextView;
 
+import com.alibaba.fastjson.JSON;
+import com.android.volley.Response;
+import com.android.volley.VolleyError;
+import com.nostra13.universalimageloader.core.ImageLoader;
+import com.xzjmyk.pm.activity.AppConstant;
+import com.xzjmyk.pm.activity.MyApplication;
 import com.xzjmyk.pm.activity.R;
+import com.xzjmyk.pm.activity.bean.Area;
+import com.xzjmyk.pm.activity.bean.UploadFileResult;
+import com.xzjmyk.pm.activity.helper.LoginHelper;
+import com.xzjmyk.pm.activity.helper.UploadService;
+import com.xzjmyk.pm.activity.ui.account.LoginActivity;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
+import com.xzjmyk.pm.activity.ui.tool.MultiImagePreviewActivity;
+import com.xzjmyk.pm.activity.util.CameraUtil;
+import com.xzjmyk.pm.activity.util.DeviceInfoUtil;
+import com.xzjmyk.pm.activity.util.ProgressDialogUtil;
+import com.xzjmyk.pm.activity.util.ToastUtil;
+import com.xzjmyk.pm.activity.view.MyGridView;
+import com.xzjmyk.pm.activity.view.SquareCenterImageView;
+import com.xzjmyk.pm.activity.volley.ObjectResult;
+import com.xzjmyk.pm.activity.volley.Result;
+import com.xzjmyk.pm.activity.volley.StringJsonObjectRequest;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
   * @desc:用户反馈界面
-  * @author:Arison on 2016/9/26
+  * @author:Arison on 2016/9/27
   */
-public class FeedbackActivity extends BaseActivity {
+public class FeedbackActivity extends BaseActivity  implements View.OnClickListener{
+    private static final int REQUEST_CODE_CAPTURE_PHOTO = 1;// 拍照
+    private static final int REQUEST_CODE_PICK_PHOTO = 2;// 图库
+    private Uri mNewPhotoUri;// 拍照和图库 获得图片的URI
+
+    private EditText mTextEdit;
+    private TextView mSelectImagePromptTv;
+    private View mSelectImgLayout;
+    private MyGridView mGridView;
+    private ArrayList<String> mPhotoList;
+    private GridViewAdapter mAdapter;
+    private String mImageData;
+
+    //添加位置和查阅人员选择
+    private TextView location_tv, display_tv;
+    public static final int LOCATION = 0x00a, DISPLAY = 0x00b;
+
+    private int mType;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_feedback);
+        if (getIntent() != null) {
+            mType = getIntent().getIntExtra("type", 0);
+        }
+        mPhotoList = new ArrayList<String>();
+        mAdapter = new GridViewAdapter();
+        mProgressDialog = ProgressDialogUtil.init(this, null, getString(R.string.please_wait));
+        initView();
+    }
+
+    private void initView() {
+        location_tv = (TextView) findViewById(R.id.location_tv);
+        display_tv = (TextView) findViewById(R.id.display_tv);
+        findViewById(R.id.release_btn).setOnClickListener(this);
+        //findViewById(R.id.location_rl).setOnClickListener(this);
+        findViewById(R.id.display_rl).setOnClickListener(this);
+
+        if (mType == 0) {
+            getSupportActionBar().setTitle(R.string.send_text);
+        } else {
+            getSupportActionBar().setTitle("用户反馈");
+        }
+        mTextEdit = (EditText) findViewById(R.id.text_edit);
+        mSelectImagePromptTv = (TextView) findViewById(R.id.select_img_prompt_tv);
+        mSelectImgLayout = findViewById(R.id.select_img_layout);
+        mGridView = (MyGridView) findViewById(R.id.grid_view);
+
+//       ToastUtil.addEditTextNumChanged(ct, mTextEdit, 200);//这里复制粘贴过多字数会在有些机型上出现bug
+        mGridView.setAdapter(mAdapter);
+
+        if (mType == 0) {
+            mSelectImagePromptTv.setVisibility(View.GONE);
+            mSelectImgLayout.setVisibility(View.GONE);
+        }
+
+        mGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
+            @Override
+            public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+                int viewType = mAdapter.getItemViewType(position);
+
+                if (viewType == 1) {
+                    showSelectPictureDialog();//第一个
+                    //TODO 选择图片页面
+//                    startActivityForResult(new Intent(ct, PhoneSelectActivity.class), 222);
+
+                } else {
+                    showPictureActionDialog(position);
+                }
+            }
+        });
+
+
+    }
+
+    private void showPictureActionDialog(final int position) {
+        String[] items = new String[]{getString(R.string.look_over), getString(R.string.delete)};
+        AlertDialog.Builder builder = new AlertDialog.Builder(this).setTitle(R.string.pictures)
+                .setSingleChoiceItems(items, 0, new DialogInterface.OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialog, int which) {
+                        if (which == 0) {// 查看
+                            Intent intent = new Intent(ct, MultiImagePreviewActivity.class);
+                            intent.putExtra(AppConstant.EXTRA_IMAGES, mPhotoList);
+                            intent.putExtra(AppConstant.EXTRA_POSITION, position);
+                            intent.putExtra(AppConstant.EXTRA_CHANGE_SELECTED, false);
+                            startActivity(intent);
+                        } else {// 删除
+                            deletePhoto(position);
+                        }
+                        dialog.dismiss();
+                    }
+                });
+        builder.show();
+    }
+
+    private void deletePhoto(final int position) {
+        mPhotoList.remove(position);
+        mAdapter.notifyDataSetInvalidated();
+    }
+
+    private void showSelectPictureDialog() {
+        String[] items = new String[]{getString(R.string.c_take_picture), getString(R.string.c_photo_album)};
+        AlertDialog.Builder builder = new AlertDialog.Builder(this).setSingleChoiceItems(items, 0,
+                new DialogInterface.OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialog, int which) {
+                        if (which == 0) {
+                            takePhoto();
+                        } else {
+                            selectPhoto();
+                        }
+                        dialog.dismiss();
+                    }
+                });
+        builder.show();
+    }
+
+    private void takePhoto() {
+        mNewPhotoUri = CameraUtil.getOutputMediaFileUri(this, CameraUtil.MEDIA_TYPE_IMAGE);
+        CameraUtil.captureImage(this, mNewPhotoUri, REQUEST_CODE_CAPTURE_PHOTO);
+    }
+
+    private void selectPhoto() {
+        CameraUtil.pickImageSimple(this, REQUEST_CODE_PICK_PHOTO);
+    }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        if (requestCode == REQUEST_CODE_CAPTURE_PHOTO) {// 拍照返回
+            if (resultCode == Activity.RESULT_OK) {
+                if (mNewPhotoUri != null) {
+                    mPhotoList.add(mNewPhotoUri.getPath());
+                    mAdapter.notifyDataSetInvalidated();
+                } else {
+                    ToastUtil.showToast(this, R.string.c_take_picture_failed);
+                }
+            }
+        } else if (requestCode == REQUEST_CODE_PICK_PHOTO) {// 选择一张图片,然后立即调用裁减
+            if (resultCode == Activity.RESULT_OK) {
+                if (data != null && data.getData() != null) {
+                    String path = CameraUtil.getImagePathFromUri(this, data.getData());
+                    mPhotoList.add(path);
+                    mAdapter.notifyDataSetInvalidated();
+                } else {
+                    ToastUtil.showToast(this, R.string.c_photo_album_failed);
+                }
+            }
+        }
+
+    }
+
+    // 发布一条说说
+    public void sendShuoshuo() {
+        Map<String, String> params = new HashMap<String, String>();
+        params.put("access_token", MyApplication.getInstance().mAccessToken);
+
+        // 消息类型:1=文字消息;2=图文消息;3=语音消息;4=视频消息;
+        if (TextUtils.isEmpty(mImageData)) {
+            params.put("type", "1");
+        } else {
+            params.put("type", "2");
+        }
+
+        // 消息标记:1:求职消息;2:招聘消息;3:普通消息;
+        params.put("flag", "3");
+        // 消息隐私范围 0=不可见;1=朋友可见;2=粉丝可见;3=广场
+        params.put("visible", "3");
+        params.put("text", mTextEdit.getText().toString());// 消息内容
+        if (!TextUtils.isEmpty(mImageData)) {
+            params.put("images", mImageData);
+        }
+
+        // 附加信息
+        params.put("model", DeviceInfoUtil.getModel());
+        params.put("osVersion", DeviceInfoUtil.getOsVersion());
+        params.put("serialNumber", DeviceInfoUtil.getDeviceId(mContext));
+
+        double latitude = MyApplication.getInstance().getBdLocationHelper().getLatitude();
+        double longitude = MyApplication.getInstance().getBdLocationHelper().getLongitude();
+
+        if (latitude != 0)
+            params.put("latitude", String.valueOf(latitude));
+        if (longitude != 0)
+            params.put("longitude", String.valueOf(longitude));
+
+        String address = MyApplication.getInstance().getBdLocationHelper().getAddress();
+
+        if (!TextUtils.isEmpty(address))
+            params.put("location", address);
+
+        Area area = Area.getDefaultCity();
+        if (area != null) {
+            params.put("cityId", String.valueOf(area.getId()));//城市Id
+        } else {
+            params.put("cityId", "0");
+        }
+        ProgressDialogUtil.show(mProgressDialog);
+        StringJsonObjectRequest<String> request = new StringJsonObjectRequest<String>(mConfig.MSG_ADD_URL,
+                new Response.ErrorListener() {
+                    @Override
+                    public void onErrorResponse(VolleyError arg0) {
+                        ToastUtil.showErrorNet(ct);
+                        ProgressDialogUtil.dismiss(mProgressDialog);
+                    }
+                }, new StringJsonObjectRequest.Listener<String>() {
+            @Override
+            public void onResponse(ObjectResult<String> result) {
+                boolean parserResult = Result.defaultParser(ct, result, true);
+                if (parserResult) {
+                    Intent intent = new Intent();
+                    intent.putExtra(AppConstant.EXTRA_MSG_ID, result.getData());
+                    setResult(RESULT_OK, intent);
+                    finish();
+                }
+                ProgressDialogUtil.dismiss(mProgressDialog);
+            }
+        }, String.class, params);
+        addDefaultRequest(request);
+    }
+
+    private ProgressDialog mProgressDialog;
+
+    @Override
+    public void onClick(View view) {
+        switch (view.getId()) {
+            case R.id.location_rl:
+//                startActivityForResult(new Intent(ct, SelectLocationActivity.class), LOCATION);
+                ToastMessage("该功能还未完善");
+                break;
+            case R.id.display_rl:
+//                startActivityForResult(new Intent(), LOCATION);
+                ToastMessage("该功能还未完善");
+                break;
+            case R.id.release_btn:
+                ToastMessage("暂不能提交操作!");
+               /* if (mPhotoList.size() <= 0 && TextUtils.isEmpty(mTextEdit.getText().toString())) {// 没有照片,也没有说说,直接返回
+                    return;
+                }
+                if (mPhotoList.size() <= 0) {// 发文字
+                    sendShuoshuo();
+                } else {//  图片+文字
+                    new UploadPhpto().execute();
+                }*/
+                break;
+        }
+
+
+    }
+
+    private class UploadPhpto extends AsyncTask<Void, Integer, Integer> {
+        @Override
+        protected void onPreExecute() {
+            super.onPreExecute();
+            ProgressDialogUtil.show(mProgressDialog);
+        }
+
+        /**
+         * 上传的结果: <br/>
+         * return 1 Token过期,请重新登陆 <br/>
+         * return 2 上传出错<br/>
+         * return 3 上传成功<br/>
+         */
+        @Override
+        protected Integer doInBackground(Void... params) {
+            if (!LoginHelper.isTokenValidation()) {
+                return 1;
+            }
+            Map<String, String> mapParams = new HashMap<String, String>();
+            mapParams.put("userId", MyApplication.getInstance().mLoginUser.getUserId() + "");
+            mapParams.put("access_token", MyApplication.getInstance().mAccessToken);
+            String result = new UploadService().uploadFile(mConfig.UPLOAD_URL, mapParams, mPhotoList);
+            Log.d("roamer", "上传图片消息:" + result);
+            if (TextUtils.isEmpty(result)) {
+                return 2;
+            }
+
+            UploadFileResult recordResult = JSON.parseObject(result, UploadFileResult.class);
+            boolean success = Result.defaultParser(ct, recordResult, true);
+            if (success) {
+                if (recordResult.getSuccess() != recordResult.getTotal()) {// 上传丢失了某些文件
+                    return 2;
+                }
+                if (recordResult.getData() != null) {
+                    UploadFileResult.Data data = recordResult.getData();
+                    if (data.getImages() != null && data.getImages().size() > 0) {
+                        mImageData = JSON.toJSONString(data.getImages(), UploadFileResult.sImagesFilter);
+                    }
+
+                    Log.d("roamer", "mImageData:" + mImageData);
+                    return 3;
+                } else {// 没有文件数据源,失败
+                    return 2;
+                }
+            } else {
+                return 2;
+            }
+        }
+
+        @Override
+        protected void onPostExecute(Integer result) {
+            super.onPostExecute(result);
+            if (result == 1) {
+                ProgressDialogUtil.dismiss(mProgressDialog);
+                startActivity(new Intent(ct, LoginActivity.class));
+            } else if (result == 2) {
+                ProgressDialogUtil.dismiss(mProgressDialog);
+                ToastUtil.showToast(ct, getString(R.string.upload_failed));
+            } else {
+                sendShuoshuo();
+            }
+        }
+
+    }
+
+    private class GridViewAdapter extends BaseAdapter {
+
+        @Override
+        public int getCount() {
+            if (mPhotoList.size() >= 9) {
+                return 9;
+            }
+            return mPhotoList.size() + 1;
+        }
+
+        @Override
+        public Object getItem(int position) {
+            return position;
+        }
+
+        @Override
+        public long getItemId(int position) {
+            return position;
+        }
+
+        @Override
+        public int getViewTypeCount() {
+            return 2;
+        }
+
+        @Override
+        public int getItemViewType(int position) {
+            if (mPhotoList.size() == 0) {
+                return 1;// View Type 1代表添加更多的视图
+            } else if (mPhotoList.size() < 9) {
+                if (position < mPhotoList.size()) {
+                    return 0;// View Type 0代表普通的ImageView视图
+                } else {
+                    return 1;
+                }
+            } else {
+                return 0;
+            }
+        }
+
+        @Override
+        public View getView(final int position, View convertView, ViewGroup parent) {
+            if (getItemViewType(position) == 0) {// 普通的视图
+                SquareCenterImageView imageView = new SquareCenterImageView(ct);
+                imageView.setScaleType(ImageView.ScaleType.CENTER_CROP);
+                String url = mPhotoList.get(position);
+                if (url == null) {
+                    url = "";
+                }
+                ImageLoader.getInstance().displayImage(Uri.fromFile(new File(url)).toString(), imageView);
+                return imageView;
+            } else {
+                View view = LayoutInflater.from(ct).inflate(R.layout.layout_circle_add_more_item,
+                        parent, false);
+                ImageView iconImageView = (ImageView) view.findViewById(R.id.icon_image_view);
+                TextView voiceTextTv = (TextView) view.findViewById(R.id.text_tv);
+                iconImageView.setBackgroundResource(R.drawable.add_picture);
+                voiceTextTv.setText(R.string.circle_add_image);
+                return view;
+            }
+        }
+
     }
 }

+ 1 - 1
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/me/UpdateSexActivity.java

@@ -7,7 +7,7 @@ import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 
 /**
   * @desc:更新性别
-  * @author:Arison on 2016/9/26
+  * @author:Arison on 2016/9/27
   */
 public class UpdateSexActivity extends BaseActivity {
 

+ 1 - 1
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/me/UpdateSingleTextActivity.java

@@ -7,7 +7,7 @@ import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 
 /**
   * @desc:更新单个编辑框的值
-  * @author:Arison on 2016/9/26
+  * @author:Arison on 2016/9/27
   */
 public class UpdateSingleTextActivity extends BaseActivity {
 

+ 101 - 3
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/me/AboutActivity.java

@@ -1,14 +1,39 @@
 package com.xzjmyk.pm.activity.ui.me;
 
+import android.content.Intent;
+import android.graphics.Bitmap;
+import android.graphics.drawable.BitmapDrawable;
+import android.net.Uri;
 import android.os.Bundle;
+import android.util.Log;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.RelativeLayout;
 import android.widget.TextView;
 
-import com.xzjmyk.pm.activity.ui.base.ActionBackActivity;
-import com.xzjmyk.pm.activity.util.DeviceInfoUtil;
+import com.afollestad.materialdialogs.GravityEnum;
+import com.afollestad.materialdialogs.MaterialDialog;
+import com.lidroid.xutils.ViewUtils;
+import com.lidroid.xutils.view.annotation.ViewInject;
+import com.uuzuche.lib_zxing.activity.CodeUtils;
+import com.xzjmyk.pm.activity.CommonWebviewActivity;
 import com.xzjmyk.pm.activity.R;
+import com.xzjmyk.pm.activity.ui.base.BaseActivity;
+import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
+import com.xzjmyk.pm.activity.util.DeviceInfoUtil;
 
-public class AboutActivity extends ActionBackActivity {
+public class AboutActivity extends BaseActivity  implements View.OnClickListener{
+	
+	@ViewInject(R.id.me_name)
+	private RelativeLayout me_name;//评价
 
+	@ViewInject(R.id.me_function)
+	private RelativeLayout me_function;
+
+	@ViewInject(R.id.me_QRcode)
+	private RelativeLayout me_QRcode;
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
@@ -18,6 +43,79 @@ public class AboutActivity extends ActionBackActivity {
 		String appName = getString(R.string.app_name);
 		String versionName = DeviceInfoUtil.getVersionName(mContext);
 		versionTv.setText(appName + " " + versionName);
+
+		ViewUtils.inject(this);
+		me_name.setOnClickListener(this);
+		me_function.setOnClickListener(this);
+		me_QRcode.setOnClickListener(this);
+	}
+	@Override
+	public boolean onCreateOptionsMenu(Menu menu) {
+		getMenuInflater().inflate(R.menu.menu_about, menu);
+		return true;
+	}
+
+	@Override
+	public boolean onOptionsItemSelected(MenuItem item) {
+		switch (item.getItemId()) {
+			case R.id.app_about:
+				ToastMessage("分享");
+				break;
+			case android.R.id.home:
+				onBackPressed();
+				break;
+		}
+		return true;
 	}
 
+
+	@Override
+	public void onClick(View v) {
+		switch (v.getId()){
+			case R.id.me_name:
+				try {
+					Uri uri = Uri.parse("market://details?id="+getPackageName());
+					Intent intent = new Intent(Intent.ACTION_VIEW,uri);
+					intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+					startActivity(intent);
+				} catch (Exception e) {
+					ViewUtil.webLinks(ct,"http://apk.91.com/Soft/Android/com.xzjmyk.pm.activity-54.html","UU互联");
+				}
+				break;
+			case R.id.me_function:
+				ViewUtil.webLinks(ct, "http://apk.91.com/Soft/Android/com.xzjmyk.pm.activity-54.html", "新功能介绍");
+				break;
+			case R.id.me_QRcode:
+				ImageView imageView = new ImageView(ct);
+				imageView.setImageResource(R.drawable.ic_uu_scan_code);
+				MaterialDialog materialDialog = new MaterialDialog.Builder(ct)
+						.title("UU互联最新版二维码\n长按可识别")
+						.customView(imageView, false)
+						.titleGravity(GravityEnum.CENTER)
+						.show();
+				final Bitmap bitmap = ((BitmapDrawable)imageView.getDrawable()).getBitmap();
+				imageView.setOnLongClickListener(new View.OnLongClickListener() {
+					@Override
+					public boolean onLongClick(View v) {
+						CodeUtils.analyzeBitmap(bitmap, new CodeUtils.AnalyzeCallback() {
+							@Override
+							public void onAnalyzeSuccess(Bitmap mBitmap, String result) {
+								Intent intent = new Intent();
+								intent.setClass(ct, CommonWebviewActivity.class);
+								intent.putExtra("scan_url", result);
+								Log.d("image_url", result);
+								startActivity(intent);
+							}
+
+							@Override
+							public void onAnalyzeFailed() {
+
+							}
+						});
+						return false;
+					}
+				});
+				break;
+		}
+	}
 }

+ 4 - 2
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/me/SettingActivity.java

@@ -28,6 +28,7 @@ import com.xzjmyk.pm.activity.helper.LoginHelper;
 import com.xzjmyk.pm.activity.sp.UserSp;
 import com.xzjmyk.pm.activity.ui.MainActivity;
 import com.xzjmyk.pm.activity.ui.base.ActionBackActivity;
+import com.xzjmyk.pm.activity.ui.erp.activity.me.FeedbackActivity;
 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.view.SwitchView;
@@ -133,8 +134,9 @@ public class SettingActivity extends ActionBackActivity implements View.OnClickL
             case R.id.clear_cache_rl:
                 clearCache();
                 break;
-            case R.id.use_help_rl: {  // 使用帮助
-                Intent intent = new Intent(mContext, WebViewActivity.class);
+            case R.id.use_help_rl: {  // 用户反馈
+                Intent intent = new Intent(mContext, FeedbackActivity.class);
+                intent.putExtra("type",1);
                 intent.putExtra(WebViewActivity.EXTRA_URL, mConfig.help_url);
                 intent.putExtra(WebViewActivity.EXTRA_TITLE, getString(R.string.use_help));
                 startActivity(intent);

BIN
WeiChat/src/main/res/drawable-hdpi/icon_app_share.png


BIN
WeiChat/src/main/res/drawable-xhdpi/icon_app_share.png


BIN
WeiChat/src/main/res/drawable-xxhdpi/icon_app_share.png


+ 105 - 1
WeiChat/src/main/res/layout/activity_about.xml

@@ -52,8 +52,112 @@
             android:layout_gravity="center_horizontal"
             android:layout_marginTop="10dp"
             android:gravity="center"
-            android:textColor="@color/black"
+            android:textColor="@color/grgray"
             android:textSize="@dimen/NormalTextSize" />
+        <View
+            android:layout_marginTop="20dp"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/line"
+            android:background="@color/item_line" />
+        <RelativeLayout
+            android:id="@+id/me_name"
+            style="@style/IMTbleLine">
+
+            <TextView
+                android:id="@+id/tv_name"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:gravity="center"
+                android:text="去评价"
+                android:textColor="@color/grgray"
+                android:textSize="16sp" />
+            <TextView
+                android:id="@+id/tv_name_value"
+                style="@style/IMTbleLine_TextValue"
+                android:layout_toLeftOf="@+id/iv_name"
+                android:layout_toRightOf="@+id/tv_name"
+                android:textColor="@color/dark_dark_grey" />
+            <ImageView
+                android:id="@+id/iv_name"
+                android:layout_width="@dimen/next_width"
+                android:layout_height="@dimen/next_height"
+                android:layout_alignParentRight="true"
+                android:layout_centerVertical="true"
+                android:alpha="0.26"
+                android:background="@drawable/set_list_next"
+                android:contentDescription="@string/app_name" />
+        </RelativeLayout>
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/line"
+            android:background="@color/item_line" />
+        <RelativeLayout
+            android:id="@+id/me_function"
+            style="@style/IMTbleLine">
+
+            <TextView
+                android:id="@+id/tv_function"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:gravity="center"
+                android:text="新功能介绍"
+                android:textColor="@color/grgray"
+                android:textSize="16sp" />
+            <TextView
+                android:id="@+id/tv_function_value"
+                style="@style/IMTbleLine_TextValue"
+                android:layout_toLeftOf="@+id/iv_function"
+                android:layout_toRightOf="@+id/tv_function"
+                android:textColor="@color/dark_dark_grey" />
+            <ImageView
+                android:id="@+id/iv_function"
+                android:layout_width="@dimen/next_width"
+                android:layout_height="@dimen/next_height"
+                android:layout_alignParentRight="true"
+                android:layout_centerVertical="true"
+                android:alpha="0.26"
+                android:background="@drawable/set_list_next"
+                android:contentDescription="@string/app_name" />
+        </RelativeLayout>
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/line"
+            android:background="@color/item_line" />
+        <RelativeLayout
+            android:id="@+id/me_QRcode"
+            style="@style/IMTbleLine">
+
+            <TextView
+                android:id="@+id/tv_QRcode"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:gravity="center"
+                android:text="二维码"
+                android:textColor="@color/grgray"
+                android:textSize="16sp"/>
+            <TextView
+                android:id="@+id/tv_QRcode_value"
+                style="@style/IMTbleLine_TextValue"
+                android:layout_toLeftOf="@+id/iv_QRcode"
+                android:layout_toRightOf="@+id/tv_QRcode"
+                android:textColor="@color/dark_grey" />
+            <ImageView
+                android:id="@+id/iv_QRcode"
+                android:layout_width="@dimen/next_width"
+                android:layout_height="@dimen/next_height"
+                android:layout_alignParentRight="true"
+                android:layout_centerVertical="true"
+                android:alpha="0.26"
+                android:background="@drawable/set_list_next"
+                android:contentDescription="@string/app_name" />
+        </RelativeLayout>
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/line"
+            android:background="@color/item_line" />
     </LinearLayout>
 
 </RelativeLayout>

+ 121 - 9
WeiChat/src/main/res/layout/activity_feedback.xml

@@ -1,10 +1,122 @@
-<?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent"
-    android:layout_height="match_parent" android:paddingLeft="@dimen/activity_horizontal_margin"
-    android:paddingRight="@dimen/activity_horizontal_margin"
-    android:paddingTop="@dimen/activity_vertical_margin"
-    android:paddingBottom="@dimen/activity_vertical_margin"
-    tools:context="com.xzjmyk.pm.activity.ui.erp.activity.me.FeedbackActivity">
-
-</RelativeLayout>
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="#EBE9EA">
+
+    <ScrollView
+        android:id="@+id/scroll_view"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+       >
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_margin="10dp"
+            android:orientation="vertical">
+
+            <EditText
+                android:id="@+id/text_edit"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="10dp"
+                android:background="@drawable/full_edit_bg"
+                android:gravity="top"
+                android:hint="请输入您的问题...(400字以内)"
+                android:inputType="textMultiLine"
+                android:minHeight="150dp"
+                android:padding="10dp"
+                android:textColor="@color/black"
+                android:textColorHint="@color/grey"
+                android:textSize="16sp" />
+
+            <TextView
+                android:id="@+id/select_img_prompt_tv"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="3dp"
+                android:layout_marginLeft="10dp"
+                android:layout_marginTop="10dp"
+                android:shadowColor="@color/white"
+                android:shadowRadius="1"
+                android:text="@string/circle_select_image"
+                android:textColor="@color/gray"
+                android:textSize="14sp"
+                android:visibility="gone" />
+
+            <LinearLayout
+                android:id="@+id/select_img_layout"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="@color/white"
+                android:padding="10dp">
+
+                <com.xzjmyk.pm.activity.view.MyGridView
+                    android:id="@+id/grid_view"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:gravity="center"
+                    android:horizontalSpacing="3dp"
+                    android:listSelector="#00000000"
+                    android:numColumns="4"
+                    android:stretchMode="columnWidth"
+                    android:verticalSpacing="3dp" />
+            </LinearLayout>
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="20px"
+                android:background="@color/item_line"
+                android:visibility="gone" />
+
+            <LinearLayout
+                android:id="@+id/display_rl"
+                android:layout_width="match_parent"
+                android:layout_height="50dp"
+                android:clickable="true"
+                android:orientation="horizontal"
+                android:padding="10dp"
+                android:visibility="gone">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:gravity="center"
+                    android:text="联系电话"
+                    android:layout_marginRight="5dp"
+                    android:textColor="@color/text_hine"
+                   />
+
+                <TextView
+                    android:id="@+id/display_tv"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:gravity="center"
+                    android:text="15814742959" />
+            </LinearLayout>
+
+
+        </LinearLayout>
+    </ScrollView>
+
+    <LinearLayout
+        android:id="@+id/bottom_layout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/scroll_view"
+        android:background="#EBE9EA"
+        android:baselineAligned="false"
+        android:orientation="vertical"
+        android:padding="10dp">
+
+        <Button
+            android:id="@+id/release_btn"
+            android:layout_width="match_parent"
+            android:layout_height="42dp"
+            android:background="@drawable/bg_btn"
+            android:text="提交"
+            android:textColor="@color/white"
+            android:textSize="16sp" />
+    </LinearLayout>
+
+</RelativeLayout>

+ 9 - 8
WeiChat/src/main/res/layout/activity_setting.xml

@@ -146,7 +146,7 @@
             <View
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/line"
-                android:layout_marginTop="@dimen/line_big"
+               
                 android:background="@color/item_line" />
 
             <RelativeLayout
@@ -180,7 +180,8 @@
 
             <RelativeLayout
                 android:id="@+id/share_rl"
-                style="@style/IMTbleLine">
+                style="@style/IMTbleLine"
+                android:visibility="gone">
 
                 <TextView
                     android:layout_width="wrap_content"
@@ -201,10 +202,7 @@
                     android:contentDescription="@string/app_name" />
             </RelativeLayout>
 
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="@dimen/line"
-                android:background="@color/item_line" />
+       
 
             <RelativeLayout
                 android:id="@+id/rl_app_update"
@@ -238,7 +236,10 @@
                     android:background="@drawable/set_list_next"
                     android:contentDescription="@string/app_name" />
             </RelativeLayout>
-
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/line"
+                android:background="@color/item_line" />
             <Button
                 android:id="@+id/exit_btn"
                 android:layout_width="match_parent"
@@ -246,7 +247,7 @@
                 android:layout_marginBottom="9dp"
                 android:layout_marginLeft="40dp"
                 android:layout_marginRight="40dp"
-                android:layout_marginTop="9dp"
+                android:layout_marginTop="18dp"
                 android:background="@drawable/bg_btn"
                 android:text="@string/exit_current_account"
                 android:textColor="@color/white" />

+ 1 - 0
WeiChat/src/main/res/layout/activity_webview.xml

@@ -14,6 +14,7 @@
         android:indeterminateDuration="500"
         android:indeterminateOnly="false"
         android:max="100"
+        android:visibility="gone"
         android:progressDrawable="@drawable/webview_progress_bar" >
     </ProgressBar>
     <com.handmark.pulltorefresh.library.PullToRefreshWebView

+ 12 - 0
WeiChat/src/main/res/menu/menu_about.xml

@@ -0,0 +1,12 @@
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:context="com.xzjmyk.pm.activity.MainActivity" >
+
+    <item
+        android:id="@+id/app_about"
+        android:icon="@drawable/icon_app_share"
+        android:title="@string/bisniss"
+        app:showAsAction="ifRoom"/>
+
+</menu>

+ 2 - 2
WeiChat/src/main/res/values/strings.xml

@@ -305,8 +305,8 @@
 
     <string name="clear_cache">清除缓存</string>
     <string name="push_setting">允许推送</string>
-    <string name="use_help">使用帮助</string>
-    <string name="about_us">关于我们</string>
+    <string name="use_help">用户反馈</string>
+    <string name="about_us">关于UU互联</string>
     <string name="app_version">当前版本</string>
     <string name="exit_tips">确定要退出此账号吗?</string>
     <string name="exit_current_account">退出当前账号</string>