Merge branch 'developer' of https://gitlab.com/Arisono/SkWeiChat-Baidu into developer

# Conflicts:
#	WeiChat/build.gradle

WeiChat/src/main/AndroidManifest.xml

@@ -3,7 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     package="com.xzjmyk.pm.activity"
     android:versionCode="54"
-    android:versionName="5.4">
+    android:versionName="5.4" >
 
     <uses-sdk
         android:minSdkVersion="11"
@@ -87,7 +87,7 @@
         android:icon="@drawable/uuu"
         android:label="@string/app_name"
         android:largeHeap="true"
-        android:theme="@style/AppTheme">
+        android:theme="@style/AppTheme" >
         <meta-data
             android:name="UMENG_APPKEY"
             android:value="574504a167e58eec520017df" />
@@ -97,7 +97,7 @@
         <!-- 启动页面 -->
         <activity
             android:name=".ui.SplashActivity"
-            android:theme="@style/SplashTheme">
+            android:theme="@style/SplashTheme" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -265,7 +265,7 @@
             android:exported="true"
             android:icon="@drawable/ic_chooser"
             android:label="@string/choose_file"
-            android:theme="@style/ChooserTheme">
+            android:theme="@style/ChooserTheme" >
             <intent-filter>
                 <action android:name="android.intent.action.GET_CONTENT" />
 
@@ -282,13 +282,13 @@
             android:enabled="@bool/use_provider"
             android:exported="true"
             android:grantUriPermissions="true"
-            android:permission="android.permission.MANAGE_DOCUMENTS">
+            android:permission="android.permission.MANAGE_DOCUMENTS" >
             <intent-filter>
                 <action android:name="android.content.action.DOCUMENTS_PROVIDER" />
             </intent-filter>
         </provider>
 
-        <receiver android:name=".broadcast.ScrenLockedBroadCastReceiver">
+        <receiver android:name=".broadcast.ScrenLockedBroadCastReceiver" >
             <intent-filter>
                 <action android:name="android.intent.action.SCREEN_OFF" />
                 <action android:name="android.intent.action.SCREEN_ON" />
@@ -315,7 +315,7 @@
         <!-- 用于接收系统消息以保证PushService正常运行 -->
         <receiver
             android:name="com.baidu.android.pushservice.PushServiceReceiver"
-            android:process=":bdservice_v1">
+            android:process=":bdservice_v1" >
             <intent-filter>
                 <action android:name="android.intent.action.BOOT_COMPLETED" />
                 <action android:name="android.net.conn.CONNECTIVITY_CHANGE" />
@@ -333,7 +333,7 @@
         <!-- Push服务接收客户端发送的各种请求 -->
         <receiver
             android:name="com.baidu.android.pushservice.RegistrationReceiver"
-            android:process=":bdservice_v1">
+            android:process=":bdservice_v1" >
             <intent-filter>
                 <action android:name="com.baidu.android.pushservice.action.METHOD" />
                 <action android:name="com.baidu.android.pushservice.action.BIND_SYNC" />
@@ -352,7 +352,7 @@
             android:name="com.baidu.android.pushservice.PushService"
             android:exported="true"
             android:persistent="true"
-            android:process=":bdservice_v1">
+            android:process=":bdservice_v1" >
             <intent-filter>
                 <action android:name="com.baidu.android.pushservice.action.PUSH_SERVICE" />
             </intent-filter>
@@ -366,7 +366,7 @@
 
 
         <!-- 此处Receiver名字修改为当前包名路径 -->
-        <receiver android:name=".ui.PushNetMessageReceiver">
+        <receiver android:name=".ui.PushNetMessageReceiver" >
             <intent-filter>
 
                 <!-- 接收push消息 -->
@@ -387,7 +387,7 @@
             </intent-filter>
         </activity>
         -->
-        <activity android:name=".ui.message.SelectCardActivity">
+        <activity android:name=".ui.message.SelectCardActivity" >
             <intent-filter>
                 <action android:name="com.xzjmyk.pm.activity.ui.message.SelectCardActivity" />
             </intent-filter>
@@ -411,7 +411,7 @@
 
         <receiver
             android:name="com.baidu.autoupdatesdk.receiver.BDBroadcastReceiver"
-            android:exported="false">
+            android:exported="false" >
             <intent-filter>
                 <action android:name="com.baidu.autoupdatesdk.ACTION_NEW_UPDATE" />
                 <action android:name="com.baidu.autoupdatesdk.ACTION_DOWNLOAD_COMPLETE" />
@@ -460,8 +460,7 @@
             android:name=".ui.erp.activity.crm.BusinessSelectCustomerActivity"
             android:launchMode="singleTask"
             android:theme="@style/CrmThemeBlue"
-            android:windowSoftInputMode="adjustResize|stateHidden"
-            />
+            android:windowSoftInputMode="adjustResize|stateHidden" />
         <activity
             android:name=".ui.message.uas.B2bMsgActivity"
             android:launchMode="singleTask" />
@@ -583,7 +582,13 @@
             android:theme="@style/OAThemeOutOffice" />
         <activity android:name=".ui.erp.activity.oa.OptionActivity" />
         <activity android:name=".ui.erp.activity.oa.SelectListActivity" />
-        <activity android:name=".ui.erp.activity.crm.SubsActivity"></activity>
+        <activity android:name=".ui.erp.activity.crm.SubsActivity" />
+        <activity android:name=".ui.erp.activity.me.UpdateSingleTextActivity" >
+        </activity>
+        <activity android:name=".ui.erp.activity.me.UpdateSexActivity" >
+        </activity>
+        <activity android:name=".ui.erp.activity.me.FeedbackActivity" >
+        </activity>
     </application>
 
-</manifest>
+</manifest>

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

@@ -1,29 +1,142 @@
 package com.xzjmyk.pm.activity.ui.erp.activity;
 
 import android.content.Intent;
-import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
+import android.os.Handler;
+import android.os.Message;
 import android.view.View;
+import android.widget.ImageView;
+import android.widget.TextView;
 
+import com.lidroid.xutils.ViewUtils;
+import com.lidroid.xutils.view.annotation.ViewInject;
 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.User;
+import com.xzjmyk.pm.activity.helper.AvatarHelper;
+import com.xzjmyk.pm.activity.helper.LoginHelper;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.cardcast.CardcastActivity;
 import com.xzjmyk.pm.activity.ui.circle.BusinessCircleActivity;
+import com.xzjmyk.pm.activity.ui.erp.db.DBManager;
+import com.xzjmyk.pm.activity.ui.erp.entity.EmployeesEntity;
+import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
+import com.xzjmyk.pm.activity.ui.erp.util.ListUtils;
 import com.xzjmyk.pm.activity.ui.me.BasicInfoEditActivity;
 import com.xzjmyk.pm.activity.ui.me.LocalVideoActivity;
+import com.xzjmyk.pm.activity.util.TimeUtils;
+
+import java.io.File;
+import java.util.List;
 
 public class BaseInfoActivity extends BaseActivity implements View.OnClickListener {
 
+    @ViewInject(R.id.me_heard_tv)
+    private ImageView iv_headImage;
+    @ViewInject(R.id.me_nickname_tv)
+    private TextView tv_nickname;
+    @ViewInject(R.id.me_sex_tv)
+    private TextView tv_sex;
+    @ViewInject(R.id.me_birthday_tv)
+    private TextView tv_birthday;
+    @ViewInject(R.id.me_address_tv)
+    private TextView tv_address;
+    @ViewInject(R.id.tv_name_value)
+    private TextView tv_name;
+    @ViewInject(R.id.tv_tel_value)
+    private TextView tv_tel;
+    @ViewInject(R.id.tv_depart_value)
+    private TextView tv_depart;
+    @ViewInject(R.id.tv_position_value)
+    private TextView tv_position;
+
+    private User mUser;
+    // Temp
+    private User mTempData;
+    // 选择头像的数据
+    private File mCurrentFile;
+    private boolean isError = false;
+    
+    private final int update_brithday=0;
+    private final int update_address=1;
+    
+    
+    private Handler mHandler=new Handler(){
+        @Override
+        public void handleMessage(Message msg) {
+           switch (msg.what){
+               case update_brithday:
+                   
+                   break;
+               case update_address:
+                   
+                   break;
+           }
+        }
+    };
+    
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_base_info);
-        getSupportActionBar().setTitle("我的资料");
+        getSupportActionBar().setTitle("个人资料");
         findViewById(R.id.my_data_rl).setOnClickListener(this);
         findViewById(R.id.my_friend_rl).setOnClickListener(this);
         findViewById(R.id.my_space_rl).setOnClickListener(this);
         findViewById(R.id.local_video_rl).setOnClickListener(this);
+        ViewUtils.inject(this);
+        
+        initView();
+    }
+    
+    private void initView(){
+        mUser = MyApplication.getInstance().mLoginUser;
+        if (!LoginHelper.isUserValidation(mUser)) {
+            isError = true;
+            return;
+        }
+        initData();
+        
+    }
+    
+    public void initData(){
+        // clone一份临时数据，用来存数变化的值，返回的时候对比有无变化
+        try {
+            mTempData = (User) mUser.clone();
+        } catch (CloneNotSupportedException e) {
+            e.printStackTrace();
+        }
+        if (mTempData.getSex() == 1) {
+//            rbBoy.setChecked(true);
+          tv_sex.setText("男");
+
+        } else {
+            tv_sex.setText("女");
+          //  rbGrid.setChecked(true);
+        }
+        tv_birthday.setText(TimeUtils.sk_time_s_long_2_str(mTempData.getBirthday()));
+        //查询数据库
+        DBManager dbManager=new DBManager(this);
+        String userId= mUser.getUserId();
+        String whichsys= CommonUtil.getSharedPreferences(this, "erp_master");
+        List<EmployeesEntity> entities= dbManager.select_getEmployee(new String[]{userId, whichsys}, "em_imid=? and whichsys=?");
+        if (ListUtils.isEmpty(entities)){
+            tv_nickname.setText(mTempData.getNickName());
+
+        }else{
+            tv_nickname.setText(entities.get(0).getEM_NAME());
+         
+        }
+        // mNameEdit.setText(mTempData.getNickName());
+        tv_name.setText(entities.get(0).getEM_NAME());
+        tv_tel.setText(mTempData.getTelephone());
+        tv_depart.setText(entities.get(0).getEM_DEFAULTORNAME());
+        tv_position.setText(entities.get(0).getEM_POSITION());
+        tv_address.setText(Area.getProvinceCityString(mTempData.getProvinceId(), mTempData.getCityId()));
+        AvatarHelper.getInstance().displayAvatar(mTempData.getUserId(), iv_headImage, true);
     }
 
     @Override

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/crm/CustomerAddActivity.java

@@ -166,10 +166,10 @@ public class CustomerAddActivity extends BaseActivity implements View.OnClickLis
 
     private void initData() {
         getCodeByNet();
-        loadParams(26);//判断预录入
+        loadParams(FORM_TYPE);//判断预录入
     }
 
-
+    
     private void initView() {
         ViewUtils.inject(this);
         Intent intent = getIntent();
@@ -181,16 +181,16 @@ public class CustomerAddActivity extends BaseActivity implements View.OnClickLis
                 ll_infomal.setVisibility(View.VISIBLE);
                 getSupportActionBar().setTitle("正式客户");
                 if (StringUtils.isEmpty(cu_code)) {
-                    CommonUtil.getCommonId(this, "CUSTOMER_SEQ", mHandler, GET_CU_ID);
+                  
                 } else {
-                    //初始化数据
-                    initCustomerData(INITCUSTOMER, cu_code);
+                    initCustomerData(INITCUSTOMER, cu_code);   //初始化数据
                 }
 
             } else {
                 ll_infomal.setVisibility(View.GONE);
                 getSupportActionBar().setTitle("客户预录入");
-                CommonUtil.getCommonId(this, "PRECUSTOMER_SEQ", mHandler, GET_CU_ID);
+              
+                
             }
         }
     }
@@ -388,8 +388,18 @@ public class CustomerAddActivity extends BaseActivity implements View.OnClickLis
                         
                         mCuId=jsonArray.getString("cu_id");
                         bt_save.setVisibility(View.GONE);
+                        
                         if (type == 1){
-                            bt_commit.setVisibility(View.VISIBLE);
+                            if (!StringUtils.isEmpty(cu_status)){
+                                if (cu_status.equals("已提交")){
+                                    bt_commit.setVisibility(View.GONE);
+                                    bt_uncommit.setVisibility(View.VISIBLE);
+                                }else {
+                                    bt_uncommit.setVisibility(View.GONE);
+                                    bt_commit.setVisibility(View.VISIBLE);
+                                }
+                            }
+                          
 
                         }else if (type == 0){
                             bt_commit.setVisibility(View.GONE);
@@ -404,12 +414,18 @@ public class CustomerAddActivity extends BaseActivity implements View.OnClickLis
                         ll_infomal.setVisibility(View.VISIBLE);
                         type = 1;//正式客户
                         getSupportActionBar().setTitle("正式客户");
-                        CommonUtil.getCommonId(ct, "CUSTOMER_SEQ", mHandler, GET_CU_ID);
+                       
+                        if (StringUtils.isEmpty(cu_code)) {
+                            CommonUtil.getCommonId(ct, "PRECUSTOMER_SEQ", mHandler, GET_CU_ID);
+                        }
                     } else {
                         ll_infomal.setVisibility(View.GONE);
                         type = 0;//客户预录入
                         getSupportActionBar().setTitle("客户预录入");
-                        CommonUtil.getCommonId(ct, "PRECUSTOMER_SEQ", mHandler, GET_CU_ID);
+                      
+                        if (StringUtils.isEmpty(cu_code)) {
+                            CommonUtil.getCommonId(ct, "CUSTOMER_SEQ", mHandler, GET_CU_ID);
+                        }
                         bt_commit.setVisibility(View.GONE);
                        // bt_save.setVisibility(View.GONE);
                         bt_uncommit.setVisibility(View.GONE);

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

@@ -0,0 +1,19 @@
+package com.xzjmyk.pm.activity.ui.erp.activity.me;
+
+import android.os.Bundle;
+
+import com.xzjmyk.pm.activity.R;
+import com.xzjmyk.pm.activity.ui.base.BaseActivity;
+
+/**
+  * @desc:用户反馈界面
+  * @author：Arison on 2016/9/26
+  */
+public class FeedbackActivity extends BaseActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_feedback);
+    }
+}

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

@@ -0,0 +1,19 @@
+package com.xzjmyk.pm.activity.ui.erp.activity.me;
+
+import android.os.Bundle;
+
+import com.xzjmyk.pm.activity.R;
+import com.xzjmyk.pm.activity.ui.base.BaseActivity;
+
+/**
+  * @desc:更新性别
+  * @author：Arison on 2016/9/26
+  */
+public class UpdateSexActivity extends BaseActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_update_sex);
+    }
+}

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

@@ -0,0 +1,19 @@
+package com.xzjmyk.pm.activity.ui.erp.activity.me;
+
+import android.os.Bundle;
+
+import com.xzjmyk.pm.activity.R;
+import com.xzjmyk.pm.activity.ui.base.BaseActivity;
+
+/**
+  * @desc:更新单个编辑框的值
+  * @author：Arison on 2016/9/26
+  */
+public class UpdateSingleTextActivity extends BaseActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_update_single_text);
+    }
+}

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

@@ -292,15 +292,11 @@ public class MeFragment extends EasyFragment implements View.OnClickListener {
                 com.xzjmyk.pm.activity.ui.erp.net.ViewUtil.LoginTask(MyApplication.getInstance().mLoginUser.getTelephone()
                         , CommonUtil.getSharedPreferences(ct, "user_password"), ct);
                 break;
-            case R.id.info_rl:
+            case R.id.info_rl://个人资料
                 startActivity(new Intent(getActivity(), BaseInfoActivity.class));
                 break;
             case R.id.rl_master_change:
-//                if (CommonUtil.isRepeatClick()){
-//                    return;
-//                }else {
                     changeMaster();
-//                }
                 break;
             case R.id.my_data_rl:// 我的资料
                 startActivityForResult(new Intent(getActivity(), BasicInfoEditActivity.class), 1);

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

@@ -4,6 +4,7 @@ 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;
@@ -71,7 +72,7 @@ public class SettingActivity extends ActionBackActivity implements View.OnClickL
         dialog.setIndeterminate(true);
         share_rl = (RelativeLayout) findViewById(R.id.share_rl);
         mExitBtn = (Button) findViewById(R.id.exit_btn);
-        share_rl.setVisibility(View.GONE);
+        //share_rl.setVisibility(View.GONE);
         int isPush = PreferenceUtils.getInt(MyApplication.getInstance(), MainActivity.BAIDU_PUSH);
         if (isPush == -1) {//第一次进入没有配置
             cb_task_reply.setChecked(true);
@@ -185,16 +186,12 @@ public class SettingActivity extends ActionBackActivity implements View.OnClickL
 
     //分享单张图片
     public void shareSingleImage() {
-//        String imagePath = Environment.getExternalStorageDirectory() + "/raw/test.jpg";
-//        //由文件得到uri
-////        Uri imageUri =Uri.parse(imagePath);
-//        String str = "android.resource://" + getApplicationContext().getPackageName() + "/" + R.raw.test;
-//        Uri imageUri=  Uri.parse("android.resource://" + getApplicationContext().getPackageName() + "/" + R.raw.test);
-//        Intent shareIntent = new Intent();
-//        shareIntent.setAction(Intent.ACTION_SEND);
-//        shareIntent.putExtra(Intent.EXTRA_STREAM, imageUri);
-//        shareIntent.setType("image/*");
-//        startActivity(Intent.createChooser(shareIntent, "分享到"));
+        Uri imageUri=  Uri.parse("android.resource://" + getApplicationContext().getPackageName() + "/" + R.drawable.ic_uu_scan_code);
+        Intent shareIntent = new Intent();
+        shareIntent.setAction(Intent.ACTION_SEND);
+        shareIntent.putExtra(Intent.EXTRA_STREAM, imageUri);
+        shareIntent.setType("image/*");
+        startActivity(Intent.createChooser(shareIntent, "分享到"));
     }
 
     private void clearCache() {

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

@@ -1,136 +1,489 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView  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:orientation="vertical"
-    tools:context="com.xzjmyk.pm.activity.ui.erp.activity.BaseInfoActivity">
-    <RelativeLayout
-        android:id="@+id/my_data_rl"
-        style="@style/IMTbleLine_UP_Me"
-        >
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:drawableLeft="@drawable/my_inf"
-            android:drawablePadding="10dp"
-            android:gravity="center"
-            android:text="@string/my_data"
-            android:textColor="@color/text_main"
-            android:textSize="@dimen/text_main" />
-
-        <ImageView
-            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_height="match_parent">
+    <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="@dimen/line"
-        android:visibility="gone"
-        android:background="@color/item_line" />
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+        tools:context="com.xzjmyk.pm.activity.ui.erp.activity.BaseInfoActivity">
+        <RelativeLayout
+            android:id="@+id/my_data_rl"
+            style="@style/IMTbleLine_UP_Me"
+            >
 
-    <RelativeLayout
-        android:id="@+id/my_friend_rl"
-        android:visibility="gone"
-        style="@style/IMTbleLine_UP_Me">
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:drawableLeft="@drawable/my_inf"
+                android:drawablePadding="10dp"
+                android:gravity="center"
+                android:text="@string/my_data"
+                android:textColor="@color/text_main"
+                android:textSize="@dimen/text_main" />
 
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:drawableLeft="@drawable/my_friend"
-            android:drawablePadding="10dp"
-            android:gravity="center"
-            android:text="@string/my_friend"
-            android:textColor="@color/text_main"
-            android:textSize="@dimen/text_main" />
-
-        <ImageView
-            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" />
+            <ImageView
+                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>
 
-    <RelativeLayout
-        android:id="@+id/my_space_rl"
-        style="@style/IMTbleLine_UP_Me">
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/line"
+            android:visibility="gone"
+            android:background="@color/item_line" />
 
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:drawableLeft="@drawable/set_fans_u"
-            android:drawablePadding="10dp"
-            android:gravity="center"
-            android:text="@string/my_space"
-            android:textColor="@color/text_main"
-            android:textSize="@dimen/text_main" />
-
-        <ImageView
-            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"
-            android:id="@+id/imageView" />
-
-        <LinearLayout
-            android:orientation="horizontal"
+        <RelativeLayout
+            android:id="@+id/my_friend_rl"
+            android:visibility="gone"
+            style="@style/IMTbleLine_UP_Me">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:drawableLeft="@drawable/my_friend"
+                android:drawablePadding="10dp"
+                android:gravity="center"
+                android:text="@string/my_friend"
+                android:textColor="@color/text_main"
+                android:textSize="@dimen/text_main" />
+
+            <ImageView
+                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="match_parent"
-            android:layout_alignBottom="@+id/imageView"
-            android:layout_alignParentRight="true"
-            android:layout_alignParentEnd="true"></LinearLayout>
-    </RelativeLayout>
+            android:layout_height="@dimen/line"
+            android:background="@color/item_line" />
 
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/line"
-        android:background="@color/item_line" />
+        <RelativeLayout
+            android:id="@+id/my_space_rl"
+            android:visibility="gone"
+            style="@style/IMTbleLine_UP_Me">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:drawableLeft="@drawable/set_fans_u"
+                android:drawablePadding="10dp"
+                android:gravity="center"
+                android:text="@string/my_space"
+                android:textColor="@color/text_main"
+                android:textSize="@dimen/text_main" />
+
+            <ImageView
+                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"
+                android:id="@+id/imageView" />
+
+            <LinearLayout
+                android:orientation="horizontal"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_alignBottom="@+id/imageView"
+                android:layout_alignParentRight="true"
+                android:layout_alignParentEnd="true"></LinearLayout>
+        </RelativeLayout>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/line"
+            android:background="@color/item_line" />
+
+
+        <RelativeLayout
+            android:id="@+id/me_heard"
+            style="@style/IMTbleLine">
+
+            <TextView
+                android:id="@+id/me_heard_text"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:gravity="center"
+                android:text="头像"
+                android:textColor="@color/black"
+                android:textSize="14sp" />
+
+            <ImageView
+                android:id="@+id/me_heard_tv"
+                android:layout_width="48dp"
+                android:layout_height="48dp"
+                android:layout_marginRight="10dp" 
+                android:layout_centerVertical="true"
+                android:background="@drawable/defaultpic"
+                android:layout_toLeftOf="@+id/me_heard_arrow_img"
+               
+                android:textColor="@color/dark_dark_grey" />
+
+            <ImageView
+                android:id="@+id/me_heard_arrow_img"
+                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_nickname"
+            style="@style/IMTbleLine">
+
+            <TextView
+                android:id="@+id/me_nickname_text"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:gravity="center"
+                android:text="昵称"
+                android:textColor="@color/black"
+                android:textSize="14sp" />
+
+            <TextView
+                android:id="@+id/me_nickname_tv"
+                style="@style/IMTbleLine_TextValue"
+                android:layout_toLeftOf="@+id/me_nickname_arrow_img"
+                android:layout_toRightOf="@+id/me_nickname_text"
+                android:textColor="@color/dark_dark_grey" />
+
+            <ImageView
+                android:id="@+id/me_nickname_arrow_img"
+                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_sex"
+            style="@style/IMTbleLine">
+
+            <TextView
+                android:id="@+id/me_sex_text"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:gravity="center"
+                android:text="性别"
+                android:textColor="@color/black"
+                android:textSize="14sp" />
+
+            <TextView
+                android:id="@+id/me_sex_tv"
+                style="@style/IMTbleLine_TextValue"
+                android:layout_toLeftOf="@+id/me_sex_arrow_img"
+                android:layout_toRightOf="@+id/me_sex_text"
+                android:textColor="@color/dark_dark_grey"
+                android:text="男" />
+
+            <ImageView
+                android:id="@+id/me_sex_arrow_img"
+                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_birthday"
+            style="@style/IMTbleLine">
+
+            <TextView
+                android:id="@+id/me_birthday_text"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:gravity="center"
+                android:text="生日"
+                android:textColor="@color/black"
+                android:textSize="14sp" />
 
-    <RelativeLayout
-        android:id="@+id/local_video_rl"
-        android:visibility="gone"
-        style="@style/IMTbleLine_UP_Me">
+            <TextView
+                android:id="@+id/me_birthday_tv"
+                style="@style/IMTbleLine_TextValue"
+                android:layout_toLeftOf="@+id/me_birthday_arrow_img"
+                android:layout_toRightOf="@+id/me_birthday_text"
+                android:textColor="@color/dark_dark_grey" />
+
+            <ImageView
+                android:id="@+id/me_birthday_arrow_img"
+                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"
+                android:layout_alignParentEnd="true" />
+        </RelativeLayout>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/line"
+            android:background="@color/item_line" />
+        <RelativeLayout
+            android:id="@+id/me_address"
+            style="@style/IMTbleLine">
+
+            <TextView
+                android:id="@+id/me_address_text"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:gravity="center"
+                android:text="地区"
+                android:textColor="@color/black"
+                android:textSize="14sp" />
+
+            <TextView
+                android:id="@+id/me_address_tv"
+                style="@style/IMTbleLine_TextValue"
+                android:layout_toLeftOf="@+id/me_address_arrow_img"
+                android:layout_toRightOf="@+id/me_address_text"
+                android:textColor="@color/dark_dark_grey" />
+
+            <ImageView
+                android:id="@+id/me_address_arrow_img"
+                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" />
 
         <TextView
-            android:layout_width="wrap_content"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:drawableLeft="@drawable/my_video"
-            android:drawablePadding="10dp"
-            android:gravity="center"
-            android:text="@string/local_video"
-            android:textColor="@color/text_main"
-            android:textSize="@dimen/text_main" />
-
-        <ImageView
-            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>
-
-</LinearLayout>
+            android:padding="10dp"
+            android:textSize="16sp"
+            android:text="企业信息"
+            android:textColor="#5690BE"/>
+        <RelativeLayout
+            android:id="@+id/local_video_rl"
+            android:visibility="gone"
+            style="@style/IMTbleLine_UP_Me">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:drawableLeft="@drawable/my_video"
+                android:drawablePadding="10dp"
+                android:gravity="center"
+                android:text="@string/local_video"
+                android:textColor="@color/text_main"
+                android:textSize="@dimen/text_main" />
+
+            <ImageView
+                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>
+
+        <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/black"
+                android:textSize="14sp" />
+            <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_tel"
+            style="@style/IMTbleLine">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:gravity="center"
+                android:text="电话"
+                android:textColor="@color/black"
+                android:textSize="14sp"
+                android:id="@+id/tv_tel" />
+            <TextView
+                android:id="@+id/tv_tel_value"
+                style="@style/IMTbleLine_TextValue"
+                android:layout_toLeftOf="@+id/iv_tel"
+                android:layout_toRightOf="@+id/tv_tel"
+                android:textColor="@color/dark_dark_grey" />
+            <ImageView
+                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"
+                android:id="@+id/iv_tel" />
+        </RelativeLayout>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/line"
+            android:background="@color/item_line" />
+
+
+        <RelativeLayout
+
+            android:id="@+id/me_depart"
+            style="@style/IMTbleLine">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:gravity="center"
+                android:text="部门"
+                android:textColor="@color/black"
+                android:textSize="14sp"
+                android:id="@+id/tv_depart" />
+            <TextView
+                android:id="@+id/tv_depart_value"
+                style="@style/IMTbleLine_TextValue"
+                android:layout_toLeftOf="@+id/iv_depart"
+                android:layout_toRightOf="@+id/tv_depart"
+                android:textColor="@color/dark_dark_grey" />
+            <ImageView
+                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"
+                android:id="@+id/iv_depart" />
+        </RelativeLayout>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/line"
+            android:background="@color/item_line" />
+
+
+
+        <RelativeLayout
+
+            android:id="@+id/me_position"
+            style="@style/IMTbleLine">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:gravity="center"
+                android:text="职位"
+                android:textColor="@color/black"
+                android:textSize="14sp"
+                android:id="@+id/tv_position" />
+            <TextView
+                android:id="@+id/tv_position_value"
+                style="@style/IMTbleLine_TextValue"
+                android:layout_toLeftOf="@+id/iv_position"
+                android:layout_toRightOf="@+id/tv_position"
+                android:textColor="@color/dark_dark_grey" />
+            <ImageView
+                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"
+                android:id="@+id/iv_position" />
+        </RelativeLayout>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/line"
+            android:background="@color/item_line" />
+
+
+    </LinearLayout>
+</ScrollView>
+

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

@@ -0,0 +1,10 @@
+<?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>

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

@@ -12,15 +12,14 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="vertical"
-            >
+            android:orientation="vertical">
 
 
             <!--公司-->
             <RelativeLayout
                 android:id="@+id/rl_uas_website"
-                style="@style/IMTbleLine"
-             >
+                android:visibility="gone"
+                style="@style/IMTbleLine">
 
                 <TextView
                     android:id="@+id/uas_website_text"
@@ -44,21 +43,21 @@
                     android:id="@+id/uas_website_arrow_img"
                     android:layout_width="@dimen/next_width"
                     android:layout_height="@dimen/next_height"
-                    android:alpha="0.26"
                     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"/>
+                android:background="@color/item_line" />
             <!--设置关闭推送-->
             <RelativeLayout
                 android:id="@+id/close_push_rl"
-                style="@style/IMTbleLine"
-                 >
+                style="@style/IMTbleLine">
 
                 <TextView
                     android:id="@+id/push_setting_text"
@@ -82,7 +81,8 @@
             <View
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/line"
-                android:background="@color/item_line"/>
+                android:background="@color/item_line" />
+
             <RelativeLayout
                 android:id="@+id/clear_cache_rl"
                 style="@style/IMTbleLine">
@@ -108,16 +108,18 @@
                     android:id="@+id/cache_arrow_img"
                     android:layout_width="@dimen/next_width"
                     android:layout_height="@dimen/next_height"
-                    android:alpha="0.26"
                     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"/>
+                android:background="@color/item_line" />
+
             <RelativeLayout
                 android:id="@+id/use_help_rl"
                 style="@style/IMTbleLine">
@@ -134,17 +136,19 @@
                 <ImageView
                     android:layout_width="@dimen/next_width"
                     android:layout_height="@dimen/next_height"
-                    android:alpha="0.26"
                     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:layout_marginTop="@dimen/line_big"
-                android:background="@color/item_line"/>
+                android:background="@color/item_line" />
+
             <RelativeLayout
 
                 android:id="@+id/about_us_rl"
@@ -162,16 +166,18 @@
                 <ImageView
                     android:layout_width="@dimen/next_width"
                     android:layout_height="@dimen/next_height"
-                    android:alpha="0.26"
                     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"/>
+                android:background="@color/item_line" />
+
             <RelativeLayout
                 android:id="@+id/share_rl"
                 style="@style/IMTbleLine">
@@ -188,20 +194,22 @@
                 <ImageView
                     android:layout_width="@dimen/next_width"
                     android:layout_height="@dimen/next_height"
-                    android:alpha="0.26"
                     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"/>
+                android:background="@color/item_line" />
+
             <RelativeLayout
-                android:clickable="true"
                 android:id="@+id/rl_app_update"
-                style="@style/IMTbleLine">
+                style="@style/IMTbleLine"
+                android:clickable="true">
 
                 <TextView
                     android:id="@+id/version_text"
@@ -224,24 +232,24 @@
                     android:id="@+id/version_arrow_img"
                     android:layout_width="@dimen/next_width"
                     android:layout_height="@dimen/next_height"
-                    android:alpha="0.26"
                     android:layout_alignParentRight="true"
                     android:layout_centerVertical="true"
+                    android:alpha="0.26"
                     android:background="@drawable/set_list_next"
                     android:contentDescription="@string/app_name" />
             </RelativeLayout>
 
             <Button
                 android:id="@+id/exit_btn"
-                android:background="@drawable/bg_btn"
                 android:layout_width="match_parent"
                 android:layout_height="50dp"
                 android:layout_marginBottom="9dp"
-                android:layout_marginTop="9dp"
                 android:layout_marginLeft="40dp"
                 android:layout_marginRight="40dp"
-                android:textColor="@color/white"
-                android:text="@string/exit_current_account" />
+                android:layout_marginTop="9dp"
+                android:background="@drawable/bg_btn"
+                android:text="@string/exit_current_account"
+                android:textColor="@color/white" />
         </LinearLayout>
     </ScrollView>
 

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

@@ -0,0 +1,10 @@
+<?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.UpdateSexActivity">
+
+</RelativeLayout>

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

@@ -0,0 +1,10 @@
+<?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.UpdateSingleTextActivity">
+
+</RelativeLayout>

WeiChat/src/main/res/values/colors.xml

@@ -7,7 +7,8 @@
     <color name="signin">#7292f8</color>
     <color name="subscrip_text">#60a0a0a0</color>
     <color name="subscrip_text1">#809b9797</color>
-    <color name="item_color1">#30a0a0a0</color>
+    <!--#30a0a0a0-->
+    <color name="item_color1">#30F5F5F5</color>
     <color name="pop_bg">#aeaeae</color>
     <color name="item_color2">@color/white</color>
     <color name="item_text">#cca0a0a0</color>