5.9 工作修改小问题；

WeiChat/build.gradle

@@ -6,7 +6,7 @@ android {
 
     defaultConfig {
         applicationId "com.xzjmyk.pm.activity"
-        minSdkVersion 11
+        minSdkVersion 8
         targetSdkVersion 22
         compileOptions {
             sourceCompatibility JavaVersion.VERSION_1_7
@@ -55,5 +55,5 @@ dependencies {
     compile files('libs/pushservice-4.5.5.77.jar')
     compile files('libs/xutils.jar')
     compile files('libs/flexjson-2.1.jar')
-    compile 'com.android.support:support-v4:23.3.0'
+    compile 'com.android.support:support-v4:22+'
 }

WeiChat/src/main/AndroidManifest.xml

@@ -2,14 +2,14 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.xzjmyk.pm.activity"
     android:versionCode="35"
-    android:versionName="3.5">
+    android:versionName="3.5" >
 
     <uses-sdk
         android:minSdkVersion="14"
         android:targetSdkVersion="22" />
 
     <!-- 拨打电话 -->
-    <uses-permission android:name="android.permission.CALL_PHONE"></uses-permission>
+    <uses-permission android:name="android.permission.CALL_PHONE" />
 
     <uses-feature android:name="android.hardware.camera" />
     <uses-feature android:name="android.hardware.camera.autofocus" />
@@ -70,12 +70,12 @@
         android:allowBackup="true"
         android:icon="@drawable/uuu"
         android:label="@string/app_name"
-        android:theme="@style/AppTheme">
+        android:theme="@style/AppTheme" >
 
         <!-- 启动页面 -->
         <activity
             android:name=".ui.SplashActivity"
-            android:theme="@style/SplashTheme">
+            android:theme="@style/SplashTheme" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -83,12 +83,12 @@
             </intent-filter>
         </activity>
         <!-- 登录模块 -->
-        <activity android:name=".ui.account.LoginActivity"></activity>
-        <activity android:name=".ui.account.LoginHistoryActivity"></activity>
-        <activity android:name=".ui.account.DataDownloadActivity"></activity>
-        <activity android:name=".ui.account.RegisterActivity"></activity>
-        <activity android:name=".ui.account.RegisterPasswordActivity"></activity>
-        <activity android:name=".ui.account.RegisterUserBasicInfoActivity"></activity>
+        <activity android:name=".ui.account.LoginActivity" />
+        <activity android:name=".ui.account.LoginHistoryActivity" />
+        <activity android:name=".ui.account.DataDownloadActivity" />
+        <activity android:name=".ui.account.RegisterActivity" />
+        <activity android:name=".ui.account.RegisterPasswordActivity" />
+        <activity android:name=".ui.account.RegisterUserBasicInfoActivity" />
 
         <!-- ERP模块 -->
         <activity android:name=".ui.erp.activity.NoticeMenuActivity" />
@@ -111,7 +111,7 @@
         <activity android:name=".ui.erp.activity.WebViewCommActivity" />
         <activity
             android:name=".ui.erp.activity.DetailTaskActivity"
-            android:windowSoftInputMode="adjustUnspecified|stateHidden"></activity>
+            android:windowSoftInputMode="adjustUnspecified|stateHidden" />
         <activity android:name=".ui.erp.activity.WebViewLoadActivity" />
         <activity android:name=".ui.erp.activity.NewsDetailActivity" />
         <activity android:name=".ui.erp.activity.NewsTwoActivity" />
@@ -135,97 +135,97 @@
             android:label="@string/app_name"
             android:launchMode="singleTask"
             android:screenOrientation="portrait"
-            android:windowSoftInputMode="stateUnspecified|adjustNothing"></activity>
+            android:windowSoftInputMode="stateUnspecified|adjustNothing" />
         <!-- 消息模块 -->
-        <activity android:name=".ui.message.ChatActivity"></activity>
-        <activity android:name=".ui.message.NewFriendActivity"></activity>
-        <activity android:name=".ui.message.MucChatActivity"></activity>
-        <activity android:name=".ui.message.RoomInfoActivity"></activity>
-        <activity android:name=".ui.message.AddContactsActivity"></activity>
+        <activity android:name=".ui.message.ChatActivity" />
+        <activity android:name=".ui.message.NewFriendActivity" />
+        <activity android:name=".ui.message.MucChatActivity" />
+        <activity android:name=".ui.message.RoomInfoActivity" />
+        <activity android:name=".ui.message.AddContactsActivity" />
         <!-- 群聊 -->
-        <activity android:name=".ui.groupchat.SelectContactsActivity"></activity>
+        <activity android:name=".ui.groupchat.SelectContactsActivity" />
 
         <!-- Circlr模块 -->
-        <activity android:name=".ui.circle.BasicInfoActivity"></activity>
-        <activity android:name=".ui.circle.BusinessCircleActivity"></activity>
-        <activity android:name=".ui.circle.CircleAudioRecordActivity"></activity>
+        <activity android:name=".ui.circle.BasicInfoActivity" />
+        <activity android:name=".ui.circle.BusinessCircleActivity" />
+        <activity android:name=".ui.circle.CircleAudioRecordActivity" />
         <activity
             android:name=".ui.circle.SendAudioActivity"
-            android:windowSoftInputMode="stateHidden|stateAlwaysHidden"></activity>
+            android:windowSoftInputMode="stateHidden|stateAlwaysHidden" />
         <activity
             android:name=".ui.circle.SendShuoshuoActivity"
-            android:windowSoftInputMode="stateHidden|stateAlwaysHidden"></activity>
+            android:windowSoftInputMode="stateHidden|stateAlwaysHidden" />
         <activity
             android:name=".ui.circle.SendVideoActivity"
-            android:windowSoftInputMode="stateHidden|stateAlwaysHidden"></activity>
+            android:windowSoftInputMode="stateHidden|stateAlwaysHidden" />
         <activity
             android:name=".ui.circle.PMsgDetailActivity"
             android:configChanges="orientation|screenSize"
-            android:windowSoftInputMode="stateAlwaysHidden|adjustUnspecified"></activity>
-        <activity android:name=".ui.circle.BaiduMapActivity"></activity>
+            android:windowSoftInputMode="stateAlwaysHidden|adjustUnspecified" />
+        <activity android:name=".ui.circle.BaiduMapActivity" />
 
         <!-- 附近模块 -->
         <activity
             android:name=".ui.nearby.UserSearchActivity"
-            android:windowSoftInputMode="stateHidden|stateAlwaysHidden"></activity>
-        <activity android:name=".ui.nearby.UserListActivity"></activity>
+            android:windowSoftInputMode="stateHidden|stateAlwaysHidden" />
+        <activity android:name=".ui.nearby.UserListActivity" />
         <!-- Me模块 -->
-        <activity android:name=".ui.me.LocalVideoActivity"></activity>
+        <activity android:name=".ui.me.LocalVideoActivity" />
         <activity
             android:name=".ui.me.SettingActivity"
             android:configChanges="keyboardHidden|orientation"
-            android:screenOrientation="portrait"></activity>
-        <activity android:name=".ui.me.AboutActivity"></activity>
-        <activity android:name=".video.VideoRecordActivity"></activity>
+            android:screenOrientation="portrait" />
+        <activity android:name=".ui.me.AboutActivity" />
+        <activity android:name=".video.VideoRecordActivity" />
         <activity
             android:name=".ui.cardcast.CardcastActivity"
-            android:theme="@style/Theme.AppCompat.Light.NoActionBar"></activity>
+            android:theme="@style/Theme.AppCompat.Light.NoActionBar" />
         <activity
             android:name=".ui.me.BasicInfoEditActivity"
-            android:windowSoftInputMode="stateHidden|stateAlwaysHidden"></activity>
+            android:windowSoftInputMode="stateHidden|stateAlwaysHidden" />
         <!-- Tool Activity -->
         <activity
             android:name=".ui.tool.MultiImagePreviewActivity"
-            android:screenOrientation="portrait"></activity>
+            android:screenOrientation="portrait" />
         <activity
             android:name=".ui.tool.SelectAreaActivity"
-            android:screenOrientation="portrait"></activity>
+            android:screenOrientation="portrait" />
         <activity
             android:name=".ui.tool.SelectConstantActivity"
-            android:screenOrientation="portrait"></activity>
+            android:screenOrientation="portrait" />
         <activity
             android:name=".ui.tool.SelectConstantSectionActivity"
-            android:screenOrientation="portrait"></activity>
+            android:screenOrientation="portrait" />
         <activity
             android:name=".ui.tool.SingleImagePreviewActivity"
-            android:screenOrientation="portrait"></activity>
+            android:screenOrientation="portrait" />
         <activity
             android:name=".ui.tool.VideoPlayActivity"
-            android:configChanges="orientation|screenSize"></activity>
+            android:configChanges="orientation|screenSize" />
         <activity
             android:name=".ui.tool.WebViewActivity"
-            android:screenOrientation="portrait"></activity>
+            android:screenOrientation="portrait" />
         <activity
             android:name=".ui.tool.SelectDateActivity"
-            android:screenOrientation="portrait"></activity>
+            android:screenOrientation="portrait" />
         <activity
             android:name=".ui.tool.MemoryFileManagement"
-            android:screenOrientation="portrait"></activity>
+            android:screenOrientation="portrait" />
         <activity
             android:name=".ui.circle.SendBaiDuLocate"
-            android:screenOrientation="portrait"></activity>
+            android:screenOrientation="portrait" />
 
         <!-- CoreService -->
-        <service android:name=".xmpp.CoreService"></service>
+        <service android:name=".xmpp.CoreService" />
         <!-- 百度Location -->
         <service
             android:name="com.baidu.location.f"
             android:enabled="true"
-            android:process=":remote"></service>
+            android:process=":remote" />
 
         <meta-data
             android:name="com.baidu.lbsapi.API_KEY"
-            android:value="kf04Evh3KhfFU7jgd3VFYhsm" />
+            android:value="KxANrz9HRWVqGGCm2cN8mXarpW0bBuYA" />
         <!-- 文件选择的activity -->
         <activity
             android:name="com.ipaulpro.afilechooser.FileChooserActivity"
@@ -233,7 +233,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" />
 
@@ -250,13 +250,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" />
@@ -266,15 +266,15 @@
         <activity
             android:name=".ui.message.InstantMessageActivity"
             android:launchMode="singleTask"
-            android:screenOrientation="portrait"></activity>
+            android:screenOrientation="portrait" />
         <activity
             android:name=".ui.message.SelectNewContactsActivity"
             android:launchMode="singleTask"
-            android:screenOrientation="portrait"></activity>
+            android:screenOrientation="portrait" />
         <activity
             android:name=".ui.message.SelectNewGroupInstantActivity"
             android:launchMode="singleTask"
-            android:screenOrientation="portrait"></activity>
+            android:screenOrientation="portrait" />
         <activity
             android:name="com.ipaulpro.afilechooser.FileReceiverActivity"
             android:screenOrientation="portrait" />
@@ -283,7 +283,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" />
@@ -299,7 +299,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" />
@@ -318,7 +318,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>
@@ -332,7 +332,7 @@
 
 
         <!-- 此处Receiver名字修改为当前包名路径 -->
-        <receiver android:name=".ui.PushNetMessageReceiver">
+        <receiver android:name=".ui.PushNetMessageReceiver" >
             <intent-filter>
 
                 <!-- 接收push消息 -->
@@ -353,7 +353,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>
@@ -377,7 +377,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" />
@@ -386,7 +386,8 @@
             </intent-filter>
         </receiver>
 
-        <activity android:name=".ui.erp.activity.CompanyActivity"></activity>
+        <activity android:name=".ui.erp.activity.CompanyActivity" />
+        <activity android:name=".ui.erp.activity.BaseInfoActivity"/>
     </application>
 
-</manifest>
+</manifest>

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

@@ -0,0 +1,50 @@
+package com.xzjmyk.pm.activity.ui.erp.activity;
+
+import android.content.Intent;
+import android.support.v7.app.AppCompatActivity;
+import android.os.Bundle;
+import android.view.View;
+
+import com.xzjmyk.pm.activity.AppConstant;
+import com.xzjmyk.pm.activity.R;
+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.me.BasicInfoEditActivity;
+import com.xzjmyk.pm.activity.ui.me.LocalVideoActivity;
+
+public class BaseInfoActivity extends BaseActivity implements View.OnClickListener {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_base_info);
+        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);
+    }
+
+    @Override
+    public void onClick(View v) {
+        int id = v.getId();
+        switch (id) {
+            case R.id.my_data_rl:// 我的资料
+                startActivityForResult(new Intent(this, BasicInfoEditActivity.class), 1);
+                break;
+            case R.id.my_friend_rl:// 我的朋友
+                startActivity(new Intent(this, CardcastActivity.class));
+                break;
+            case R.id.my_space_rl:// 我的空间
+                Intent intent = new Intent(this, BusinessCircleActivity.class);
+                intent.putExtra(AppConstant.EXTRA_CIRCLE_TYPE, AppConstant.CIRCLE_TYPE_PERSONAL_SPACE);
+                startActivity(intent);
+                break;
+            case R.id.local_video_rl:// 本地视频
+                startActivity(new Intent(this, LocalVideoActivity.class));
+                break;
+        }
+    }
+
+}

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

@@ -23,6 +23,7 @@ import com.xzjmyk.pm.activity.helper.AvatarHelper;
 import com.xzjmyk.pm.activity.ui.base.EasyFragment;
 import com.xzjmyk.pm.activity.ui.cardcast.CardcastActivity;
 import com.xzjmyk.pm.activity.ui.circle.BusinessCircleActivity;
+import com.xzjmyk.pm.activity.ui.erp.activity.BaseInfoActivity;
 import com.xzjmyk.pm.activity.ui.erp.model.Master;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.Constants;
@@ -40,6 +41,7 @@ import java.util.List;
 import java.util.Map;
 
 public class MeFragment extends EasyFragment implements View.OnClickListener {
+
     private ImageView mAvatarImg;
     private TextView mNickNameTv;
     private TextView mPhoneNumTv;
@@ -54,6 +56,10 @@ public class MeFragment extends EasyFragment implements View.OnClickListener {
     @ViewInject(R.id.tv_b2b_login)
     private TextView tv_b2b_login;
 
+
+    @ViewInject(R.id.info_rl)
+    private RelativeLayout rl_info;
+
     @ViewInject(R.id.rl_company_change)
     private RelativeLayout rl_company_change;
     @ViewInject(R.id.rl_master_change)
@@ -65,10 +71,10 @@ public class MeFragment extends EasyFragment implements View.OnClickListener {
     private Handler mhandler = new Handler() {
         @Override
         public void handleMessage(Message msg) {
-            switch (msg.what){
+            switch (msg.what) {
                 case Constants.APP_SOCKETIMEOUTEXCEPTION:
-                    ToastUtil.showToast(getActivity(),"服务器繁忙！");
-                break;
+                    ToastUtil.showToast(getActivity(), "服务器繁忙！");
+                    break;
                 case 1://获取中文账套
                     String result = msg.getData().getString("result"); //解析账套信息
                     boolean isJsonStr = new JsonValidator().validate(result);
@@ -122,6 +128,7 @@ public class MeFragment extends EasyFragment implements View.OnClickListener {
             }
         }
     };
+    private Intent intent;
 
     public MeFragment() {
     }
@@ -156,6 +163,7 @@ public class MeFragment extends EasyFragment implements View.OnClickListener {
 
         rl_company_change.setOnClickListener(this);
         rl_master_change.setOnClickListener(this);
+        rl_info.setOnClickListener(this);
 
         mAvatarImg = (ImageView) findViewById(R.id.avatar_img);
         mNickNameTv = (TextView) findViewById(R.id.nick_name_tv);
@@ -228,12 +236,12 @@ public class MeFragment extends EasyFragment implements View.OnClickListener {
         int id = v.getId();
         switch (id) {
             case R.id.rl_company_change:
-//                    Log.i("LoginApp","手机号："+MyApplication.getInstance().mLoginUser.getTelephone() );
-//                    Log.i("LoginApp","密码："+ CommonUtil.getSharedPreferences(ct,"user_password"));
-                String commpany = CommonUtil.getSharedPreferences(ct, "erp_commpany");
                 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:
+                startActivity(new Intent(getActivity(), BaseInfoActivity.class));
+                break;
             case R.id.rl_master_change:
                 changeMaster();
                 break;
@@ -244,11 +252,9 @@ public class MeFragment extends EasyFragment implements View.OnClickListener {
                 startActivity(new Intent(getActivity(), CardcastActivity.class));
                 break;
             case R.id.my_space_rl:// 我的空间
-            {
-                Intent intent = new Intent(getActivity(), BusinessCircleActivity.class);
-                intent.putExtra(AppConstant.EXTRA_CIRCLE_TYPE, AppConstant.CIRCLE_TYPE_PERSONAL_SPACE);
-                startActivity(intent);
-            }
+//                Intent intent = intent;
+//                intent.putExtra(AppConstant.EXTRA_CIRCLE_TYPE, AppConstant.CIRCLE_TYPE_PERSONAL_SPACE);
+//                startActivity(intent);
             break;
             case R.id.local_video_rl:// 本地视频
                 startActivity(new Intent(getActivity(), LocalVideoActivity.class));

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

@@ -0,0 +1,136 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout 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_width="match_parent"
+        android:layout_height="@dimen/line"
+        android:visibility="gone"
+        android:background="@color/item_line" />
+
+    <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="@dimen/line"
+        android:background="@color/item_line" />
+
+    <RelativeLayout
+        android:id="@+id/my_space_rl"
+        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/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>
+
+</LinearLayout>

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

@@ -125,6 +125,7 @@
 
         <TextView
             android:id="@+id/im_videochat_tv"
+            android:visibility="invisible"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_gravity="center"

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

@@ -18,7 +18,7 @@
             android:layout_marginLeft="18dp"
             android:layout_marginRight="18dp"
             android:gravity="center_vertical"
-            android:text="房间名称"
+            android:text="群名称"
             android:textSize="@dimen/text_main" />
 
         <com.xzjmyk.pm.activity.view.ClearEditText
@@ -52,7 +52,7 @@
             android:layout_marginLeft="18dp"
             android:layout_marginRight="18dp"
             android:gravity="center_vertical"
-            android:text="房间说明"
+            android:text="群说明"
             android:textSize="@dimen/text_main"
 
             />

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

@@ -69,6 +69,7 @@
             android:background="@color/item_line" />
         <RelativeLayout
             android:id="@+id/my_data_rl"
+            android:visibility="gone"
             style="@style/IMTbleLine_UP_Me"
            >
 
@@ -96,10 +97,12 @@
         <View
             android:layout_width="match_parent"
             android:layout_height="@dimen/line"
+            android:visibility="gone"
             android:background="@color/item_line" />
 
         <RelativeLayout
             android:id="@+id/my_friend_rl"
+            android:visibility="gone"
             style="@style/IMTbleLine_UP_Me">
 
             <TextView
@@ -126,10 +129,12 @@
         <View
             android:layout_width="match_parent"
             android:layout_height="@dimen/line"
+            android:visibility="gone"
             android:background="@color/item_line" />
 
         <RelativeLayout
             android:id="@+id/my_space_rl"
+            android:visibility="gone"
             style="@style/IMTbleLine_UP_Me">
 
             <TextView
@@ -150,7 +155,16 @@
                 android:layout_centerVertical="true"
                 android:alpha="0.26"
                 android:background="@drawable/set_list_next"
-                android:contentDescription="@string/app_name" />
+                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

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

@@ -147,13 +147,13 @@
     <!-- 发现模块 -->
     <string name="newest">互相关注</string>
     <string name="hotest">单向关注</string>
-    <string name="nearest">关注房间</string>
+    <string name="nearest">关注群</string>
     <string name="bisniss">我的朋友</string>
     <!-- 加好友 -->
     <string name="remark_name_format_error">备注名不合法，只允许中文、英文、字母和下划线，且长度为3至10个字符</string>
     <string name="unilateral_attention">单向关注</string>
     <string name="focus_on_each_other">互相关注</string>
-    <string name="focus_room">关注房间</string>
+    <string name="focus_room">关注群</string>
     <string name="set_remark_name">设置备注名称</string>
     <string name="remove_blacklist">移出黑名单</string>
     <string name="remove_blacklist_succ">移出黑名单成功</string>
@@ -238,13 +238,13 @@
     <!-- 群聊 -->
     <string name="add_chat_ok_btn">确定(<xliff:g id="count">%1$s</xliff:g>)</string>
     <string name="select_contacts">选择联系人</string>
-    <string name="please_input_room_name">请输入房间名</string>
-    <string name="please_input_room_desc">请输入房间描述</string>
+    <string name="please_input_room_name">请输入群名</string>
+    <string name="please_input_room_desc">请输入群描述</string>
     <string name="service_start_failed">服务启动失败</string>
-    <string name="create_room">创建房间</string>
-    <string name="room_name_empty_error">房间名不能为空</string>
-    <string name="room_des_empty_error">房间描述不能为空</string>
-    <string name="create_room_failed">创建房间失败</string>
+    <string name="create_room">创建群</string>
+    <string name="room_name_empty_error">群名不能为空</string>
+    <string name="room_des_empty_error">群描述不能为空</string>
+    <string name="create_room_failed">创建群失败</string>
 
     <!-- MeFragment -->
     <string name="my_uas">UAS账户</string>\
@@ -257,23 +257,23 @@
     <string name="setting">设置</string>
 
     <!-- RoomInfoActivity -->
-    <string name="room_info">房间信息</string>
-    <string name="room_name">房间名称</string>
+    <string name="room_info">群信息</string>
+    <string name="room_name">群名称</string>
     <string name="notice">群内公告</string>
-    <string name="room_desc">房间说明</string>
+    <string name="room_desc">群说明</string>
     <string name="creator">创建者</string>
     <string name="people_count">成员上限</string>
     <string name="my_nick_name">我的群昵称</string>
     <string name="can_not_remove_self">你不能移除你自己</string>
     <string name="can_not_banned_self">你不能禁言你自己</string>
     <string name="banned_voice">禁言</string>
-    <string name="banned_exit_room">退出房间</string>
-    <string name="banned_delete_room">解散房间</string>
+    <string name="banned_exit_room">退出群</string>
+    <string name="banned_delete_room">解散群</string>
     <string name="create_chat_time">创建时间</string>
     <string name="shield_chat">屏蔽群消息</string>
     <string name="update_success">更新成功</string>
-    <string name="change_room_name">修改房间名</string>
-    <string name="change_room_des">修改房间说明</string>
+    <string name="change_room_name">修改群名</string>
+    <string name="change_room_des">修改群说明</string>
     <string name="change_my_nickname">修改我的群昵称</string>
     <string name="add_notice">添加公告</string>
     <!-- SettingActivity -->