Browse Source

提交版本

Bitliker 9 years ago
parent
commit
a8f160f719

+ 17 - 18
WeiChat/src/main/AndroidManifest.xml

@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.xzjmyk.pm.activity"
     package="com.xzjmyk.pm.activity"
     android:versionCode="45"
     android:versionCode="45"
-    android:versionName="4.5" >
+    android:versionName="4.5">
 
 
     <uses-sdk
     <uses-sdk
         android:minSdkVersion="11"
         android:minSdkVersion="11"
@@ -69,7 +69,7 @@
         android:allowBackup="true"
         android:allowBackup="true"
         android:icon="@drawable/uuu"
         android:icon="@drawable/uuu"
         android:label="@string/app_name"
         android:label="@string/app_name"
-        android:theme="@style/AppTheme" >
+        android:theme="@style/AppTheme">
         <meta-data
         <meta-data
             android:name="UMENG_APPKEY"
             android:name="UMENG_APPKEY"
             android:value="574504a167e58eec520017df" />
             android:value="574504a167e58eec520017df" />
@@ -80,7 +80,7 @@
         <!-- 启动页面 -->
         <!-- 启动页面 -->
         <activity
         <activity
             android:name=".ui.SplashActivity"
             android:name=".ui.SplashActivity"
-            android:theme="@style/SplashTheme" >
+            android:theme="@style/SplashTheme">
             <intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <action android:name="android.intent.action.MAIN" />
 
 
@@ -240,7 +240,7 @@
             android:exported="true"
             android:exported="true"
             android:icon="@drawable/ic_chooser"
             android:icon="@drawable/ic_chooser"
             android:label="@string/choose_file"
             android:label="@string/choose_file"
-            android:theme="@style/ChooserTheme" >
+            android:theme="@style/ChooserTheme">
             <intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.GET_CONTENT" />
                 <action android:name="android.intent.action.GET_CONTENT" />
 
 
@@ -257,13 +257,13 @@
             android:enabled="@bool/use_provider"
             android:enabled="@bool/use_provider"
             android:exported="true"
             android:exported="true"
             android:grantUriPermissions="true"
             android:grantUriPermissions="true"
-            android:permission="android.permission.MANAGE_DOCUMENTS" >
+            android:permission="android.permission.MANAGE_DOCUMENTS">
             <intent-filter>
             <intent-filter>
                 <action android:name="android.content.action.DOCUMENTS_PROVIDER" />
                 <action android:name="android.content.action.DOCUMENTS_PROVIDER" />
             </intent-filter>
             </intent-filter>
         </provider>
         </provider>
 
 
-        <receiver android:name=".broadcast.ScrenLockedBroadCastReceiver" >
+        <receiver android:name=".broadcast.ScrenLockedBroadCastReceiver">
             <intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.SCREEN_OFF" />
                 <action android:name="android.intent.action.SCREEN_OFF" />
                 <action android:name="android.intent.action.SCREEN_ON" />
                 <action android:name="android.intent.action.SCREEN_ON" />
@@ -290,7 +290,7 @@
         <!-- 用于接收系统消息以保证PushService正常运行 -->
         <!-- 用于接收系统消息以保证PushService正常运行 -->
         <receiver
         <receiver
             android:name="com.baidu.android.pushservice.PushServiceReceiver"
             android:name="com.baidu.android.pushservice.PushServiceReceiver"
-            android:process=":bdservice_v1" >
+            android:process=":bdservice_v1">
             <intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.BOOT_COMPLETED" />
                 <action android:name="android.intent.action.BOOT_COMPLETED" />
                 <action android:name="android.net.conn.CONNECTIVITY_CHANGE" />
                 <action android:name="android.net.conn.CONNECTIVITY_CHANGE" />
@@ -306,7 +306,7 @@
         <!-- Push服务接收客户端发送的各种请求 -->
         <!-- Push服务接收客户端发送的各种请求 -->
         <receiver
         <receiver
             android:name="com.baidu.android.pushservice.RegistrationReceiver"
             android:name="com.baidu.android.pushservice.RegistrationReceiver"
-            android:process=":bdservice_v1" >
+            android:process=":bdservice_v1">
             <intent-filter>
             <intent-filter>
                 <action android:name="com.baidu.android.pushservice.action.METHOD" />
                 <action android:name="com.baidu.android.pushservice.action.METHOD" />
                 <action android:name="com.baidu.android.pushservice.action.BIND_SYNC" />
                 <action android:name="com.baidu.android.pushservice.action.BIND_SYNC" />
@@ -325,7 +325,7 @@
             android:name="com.baidu.android.pushservice.PushService"
             android:name="com.baidu.android.pushservice.PushService"
             android:exported="true"
             android:exported="true"
             android:persistent="true"
             android:persistent="true"
-            android:process=":bdservice_v1" >
+            android:process=":bdservice_v1">
             <intent-filter>
             <intent-filter>
                 <action android:name="com.baidu.android.pushservice.action.PUSH_SERVICE" />
                 <action android:name="com.baidu.android.pushservice.action.PUSH_SERVICE" />
             </intent-filter>
             </intent-filter>
@@ -339,7 +339,7 @@
 
 
 
 
         <!-- 此处Receiver名字修改为当前包名路径 -->
         <!-- 此处Receiver名字修改为当前包名路径 -->
-        <receiver android:name=".ui.PushNetMessageReceiver" >
+        <receiver android:name=".ui.PushNetMessageReceiver">
             <intent-filter>
             <intent-filter>
 
 
                 <!-- 接收push消息 -->
                 <!-- 接收push消息 -->
@@ -360,7 +360,7 @@
             </intent-filter>
             </intent-filter>
         </activity>
         </activity>
         -->
         -->
-        <activity android:name=".ui.message.SelectCardActivity" >
+        <activity android:name=".ui.message.SelectCardActivity">
             <intent-filter>
             <intent-filter>
                 <action android:name="com.xzjmyk.pm.activity.ui.message.SelectCardActivity" />
                 <action android:name="com.xzjmyk.pm.activity.ui.message.SelectCardActivity" />
             </intent-filter>
             </intent-filter>
@@ -384,7 +384,7 @@
 
 
         <receiver
         <receiver
             android:name="com.baidu.autoupdatesdk.receiver.BDBroadcastReceiver"
             android:name="com.baidu.autoupdatesdk.receiver.BDBroadcastReceiver"
-            android:exported="false" >
+            android:exported="false">
             <intent-filter>
             <intent-filter>
                 <action android:name="com.baidu.autoupdatesdk.ACTION_NEW_UPDATE" />
                 <action android:name="com.baidu.autoupdatesdk.ACTION_NEW_UPDATE" />
                 <action android:name="com.baidu.autoupdatesdk.ACTION_DOWNLOAD_COMPLETE" />
                 <action android:name="com.baidu.autoupdatesdk.ACTION_DOWNLOAD_COMPLETE" />
@@ -401,7 +401,7 @@
         <activity android:name=".ui.circle.PhoneSelectActivity" />
         <activity android:name=".ui.circle.PhoneSelectActivity" />
         <activity android:name=".ui.erp.activity.crm.ClientActivity" />
         <activity android:name=".ui.erp.activity.crm.ClientActivity" />
         <activity android:name=".ui.erp.activity.oa.SigninActivity" />
         <activity android:name=".ui.erp.activity.oa.SigninActivity" />
-        <activity android:name=".ui.erp.activity.oa.OA_AlarmaActivity" />
+        <activity android:name=".ui.erp.activity.oa.AlarmaActivity" />
         <activity android:name=".ui.erp.activity.oa.MeetingActivity" />
         <activity android:name=".ui.erp.activity.oa.MeetingActivity" />
         <activity android:name=".ui.erp.activity.oa.AddMeetingActivity" />
         <activity android:name=".ui.erp.activity.oa.AddMeetingActivity" />
         <activity
         <activity
@@ -441,10 +441,9 @@
         <activity android:name=".ui.erp.activity.oa.WorkLogsActivity" />
         <activity android:name=".ui.erp.activity.oa.WorkLogsActivity" />
         <activity android:name=".ui.erp.activity.oa.AddSigninActivity" />
         <activity android:name=".ui.erp.activity.oa.AddSigninActivity" />
         <activity android:name=".ui.erp.activity.oa.AddNextSigninActivity" />
         <activity android:name=".ui.erp.activity.oa.AddNextSigninActivity" />
-        <activity android:name=".ui.erp.activity.oa.SigninTimeSetActivity" >
-        </activity>
-        <activity android:name=".ui.erp.activity.oa.SuperSetActivity" >
-        </activity>
+        <activity android:name=".ui.erp.activity.oa.SigninTimeSetActivity"></activity>
+        <activity android:name=".ui.erp.activity.oa.SuperSetActivity"></activity>
+        <activity android:name=".ui.erp.activity.oa.AddLogActivity"></activity>
     </application>
     </application>
 
 
-</manifest>
+</manifest>

+ 11 - 8
WeiChat/src/main/java/com/xzjmyk/pm/activity/adapter/PublicMessageAdapter.java

@@ -306,6 +306,7 @@ public class PublicMessageAdapter extends BaseAdapter implements BusinessCircleA
                 holder.video_desc_tv = (TextView) innerView.findViewById(R.id.video_desc_tv);
                 holder.video_desc_tv = (TextView) innerView.findViewById(R.id.video_desc_tv);
                 viewHolder = holder;
                 viewHolder = holder;
             }
             }
+            viewHolder.location_tv = (TextView) convertView.findViewById(R.id.location_tv);
             viewHolder.avatar_img = (ImageView) convertView.findViewById(R.id.avatar_img);
             viewHolder.avatar_img = (ImageView) convertView.findViewById(R.id.avatar_img);
             viewHolder.nick_name_tv = (TextView) convertView.findViewById(R.id.nick_name_tv);
             viewHolder.nick_name_tv = (TextView) convertView.findViewById(R.id.nick_name_tv);
             viewHolder.time_tv = (TextView) convertView.findViewById(R.id.time_tv);
             viewHolder.time_tv = (TextView) convertView.findViewById(R.id.time_tv);
@@ -315,7 +316,6 @@ public class PublicMessageAdapter extends BaseAdapter implements BusinessCircleA
             viewHolder.operation_more_img = (ImageView) convertView.findViewById(R.id.operation_more_img);
             viewHolder.operation_more_img = (ImageView) convertView.findViewById(R.id.operation_more_img);
             viewHolder.multi_praise_tv = (TextView) convertView.findViewById(R.id.multi_praise_tv);
             viewHolder.multi_praise_tv = (TextView) convertView.findViewById(R.id.multi_praise_tv);
             viewHolder.command_listView = (ListView) convertView.findViewById(R.id.command_listView);
             viewHolder.command_listView = (ListView) convertView.findViewById(R.id.command_listView);
-            viewHolder.viewLine = convertView.findViewById(R.id.line);
             viewHolder.praise_rl = (RelativeLayout) convertView.findViewById(R.id.praise_rl);
             viewHolder.praise_rl = (RelativeLayout) convertView.findViewById(R.id.praise_rl);
             viewHolder.img_praise_top = (ImageView) convertView.findViewById(R.id.img_praise_top);
             viewHolder.img_praise_top = (ImageView) convertView.findViewById(R.id.img_praise_top);
             viewHolder.img_praise_line = convertView.findViewById(R.id.img_praise_line);
             viewHolder.img_praise_line = convertView.findViewById(R.id.img_praise_line);
@@ -333,13 +333,20 @@ public class PublicMessageAdapter extends BaseAdapter implements BusinessCircleA
         if (message == null) {
         if (message == null) {
             return convertView;
             return convertView;
         }
         }
+
+        //判断有地理位置信息
+        if (message.getLocation() != null && message.getLocation().length() > 0) {
+            viewHolder.location_tv.setVisibility(View.VISIBLE);
+            viewHolder.location_tv.setText(message.getLocation());
+        } else {
+            viewHolder.location_tv.setVisibility(View.GONE);
+        }
         // 设备头像
         // 设备头像
         AvatarHelper.getInstance().displayAvatar(message.getUserId(), viewHolder.avatar_img, true);
         AvatarHelper.getInstance().displayAvatar(message.getUserId(), viewHolder.avatar_img, true);
         /* 设置昵称 */
         /* 设置昵称 */
         SpannableStringBuilder nickNamebuilder = new SpannableStringBuilder();
         SpannableStringBuilder nickNamebuilder = new SpannableStringBuilder();
         final String userId = message.getUserId();
         final String userId = message.getUserId();
         String showName = getShowName(userId, message.getNickName());
         String showName = getShowName(userId, message.getNickName());
-
         UserClickableSpan.setClickableSpan(mContext, nickNamebuilder, showName, message.getUserId());
         UserClickableSpan.setClickableSpan(mContext, nickNamebuilder, showName, message.getUserId());
         if (getType() == AppConstant.CIRCLE_TYPE_PERSONAL_SPACE) { //个人空间  移除用户名
         if (getType() == AppConstant.CIRCLE_TYPE_PERSONAL_SPACE) { //个人空间  移除用户名
             viewHolder.nick_name_tv.setVisibility(View.GONE);
             viewHolder.nick_name_tv.setVisibility(View.GONE);
@@ -435,11 +442,7 @@ public class PublicMessageAdapter extends BaseAdapter implements BusinessCircleA
         viewHolder.multi_praise_tv.setMovementMethod(LinkMovementClickMethod.getInstance());
         viewHolder.multi_praise_tv.setMovementMethod(LinkMovementClickMethod.getInstance());
             /* 设置回复 */
             /* 设置回复 */
         final List<Comment> comments = message.getComments();
         final List<Comment> comments = message.getComments();
-        if ((praises != null && praises.size() > 0) || (comments != null && comments.size() > 0)) {
-            viewHolder.viewLine.setVisibility(View.GONE);
-        } else {
-            viewHolder.viewLine.setVisibility(View.GONE);
-        }
+
         if (comments != null && comments.size() > 0) {
         if (comments != null && comments.size() > 0) {
             viewHolder.command_listView.setVisibility(View.VISIBLE);
             viewHolder.command_listView.setVisibility(View.VISIBLE);
             for (int i = 0; i < comments.size(); i++)
             for (int i = 0; i < comments.size(); i++)
@@ -611,7 +614,6 @@ public class PublicMessageAdapter extends BaseAdapter implements BusinessCircleA
     }
     }
 
 
     class ViewHolder {
     class ViewHolder {
-        View viewLine;
         ImageView avatar_img;
         ImageView avatar_img;
         TextView nick_name_tv;
         TextView nick_name_tv;
         TextView time_tv;
         TextView time_tv;
@@ -624,6 +626,7 @@ public class PublicMessageAdapter extends BaseAdapter implements BusinessCircleA
         RelativeLayout praise_rl;
         RelativeLayout praise_rl;
         ImageView img_praise_top;
         ImageView img_praise_top;
         View img_praise_line;
         View img_praise_line;
+        TextView location_tv;//地理位置信息
     }
     }
 
 
     /* 普通的Text */
     /* 普通的Text */

+ 1 - 1
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/circle/BusinessCircleActivity.java

@@ -468,6 +468,7 @@ public class BusinessCircleActivity extends BaseActivity implements showCEView {
                 if (result != null && result.getData() != null && result.getData().size() > 0) {
                 if (result != null && result.getData() != null && result.getData().size() > 0) {
                     mMessages.clear();
                     mMessages.clear();
                     mMessages.addAll(result.getData());
                     mMessages.addAll(result.getData());
+
                     mAdapter.notifyDataSetInvalidated();
                     mAdapter.notifyDataSetInvalidated();
 
 
                 }
                 }
@@ -597,7 +598,6 @@ public class BusinessCircleActivity extends BaseActivity implements showCEView {
                     for (int i = 0; i < datas.size(); i++) {
                     for (int i = 0; i < datas.size(); i++) {
                         Collections.sort(datas.get(i).getComments(), comp);
                         Collections.sort(datas.get(i).getComments(), comp);
                     }
                     }
-
                     if (isPullDwonToRefersh) {
                     if (isPullDwonToRefersh) {
                         mMessages.clear();
                         mMessages.clear();
                     }
                     }

+ 2 - 4
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/circle/SendShuoshuoActivity.java

@@ -82,6 +82,7 @@ public class SendShuoshuoActivity extends BaseActivity {
         mProgressDialog = ProgressDialogUtil.init(this, null, getString(R.string.please_wait));
         mProgressDialog = ProgressDialogUtil.init(this, null, getString(R.string.please_wait));
         initView();
         initView();
     }
     }
+
     private void initView() {
     private void initView() {
         if (mType == 0) {
         if (mType == 0) {
             getSupportActionBar().setTitle(R.string.send_text);
             getSupportActionBar().setTitle(R.string.send_text);
@@ -198,7 +199,6 @@ public class SendShuoshuoActivity extends BaseActivity {
         } else if (requestCode == REQUEST_CODE_PICK_PHOTO) {// 选择一张图片,然后立即调用裁减
         } else if (requestCode == REQUEST_CODE_PICK_PHOTO) {// 选择一张图片,然后立即调用裁减
             if (resultCode == Activity.RESULT_OK) {
             if (resultCode == Activity.RESULT_OK) {
                 if (data != null && data.getData() != null) {
                 if (data != null && data.getData() != null) {
-                    Log.i("gongpengming", data.getData().getPath());
                     String path = CameraUtil.getImagePathFromUri(this, data.getData());
                     String path = CameraUtil.getImagePathFromUri(this, data.getData());
                     mPhotoList.add(path);
                     mPhotoList.add(path);
                     mAdapter.notifyDataSetInvalidated();
                     mAdapter.notifyDataSetInvalidated();
@@ -224,12 +224,9 @@ public class SendShuoshuoActivity extends BaseActivity {
 
 
         // 消息标记:1:求职消息;2:招聘消息;3:普通消息;
         // 消息标记:1:求职消息;2:招聘消息;3:普通消息;
         params.put("flag", "3");
         params.put("flag", "3");
-
         // 消息隐私范围 0=不可见;1=朋友可见;2=粉丝可见;3=广场
         // 消息隐私范围 0=不可见;1=朋友可见;2=粉丝可见;3=广场
         params.put("visible", "3");
         params.put("visible", "3");
-
         params.put("text", mTextEdit.getText().toString());// 消息内容
         params.put("text", mTextEdit.getText().toString());// 消息内容
-
         if (!TextUtils.isEmpty(mImageData)) {
         if (!TextUtils.isEmpty(mImageData)) {
             params.put("images", mImageData);
             params.put("images", mImageData);
         }
         }
@@ -248,6 +245,7 @@ public class SendShuoshuoActivity extends BaseActivity {
             params.put("longitude", String.valueOf(longitude));
             params.put("longitude", String.valueOf(longitude));
 
 
         String address = MyApplication.getInstance().getBdLocationHelper().getAddress();
         String address = MyApplication.getInstance().getBdLocationHelper().getAddress();
+
         if (!TextUtils.isEmpty(address))
         if (!TextUtils.isEmpty(address))
             params.put("location", address);
             params.put("location", address);
 
 

+ 27 - 0
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/AddLogActivity.java

@@ -0,0 +1,27 @@
+package com.xzjmyk.pm.activity.ui.erp.activity.oa;
+
+import android.os.Bundle;
+import android.view.View;
+
+import com.xzjmyk.pm.activity.R;
+import com.xzjmyk.pm.activity.ui.base.BaseActivity;
+
+public class AddLogActivity extends BaseActivity implements View.OnClickListener{
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_add_log);
+        getSupportActionBar().setTitle("新增日志");
+        initView();
+    }
+
+    private void initView() {
+        findViewById(R.id.add).setOnClickListener(this);
+    }
+
+    @Override
+    public void onClick(View view) {
+
+    }
+}

+ 1 - 1
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/OA_AlarmaActivity.java → WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/AlarmaActivity.java

@@ -6,7 +6,7 @@ import android.view.View;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 
 
-public class OA_AlarmaActivity extends BaseActivity implements View.OnClickListener {
+public class AlarmaActivity extends BaseActivity implements View.OnClickListener {
 
 
     @Override
     @Override
     protected void onCreate(Bundle savedInstanceState) {
     protected void onCreate(Bundle savedInstanceState) {

+ 4 - 2
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/WorkLogsActivity.java

@@ -1,5 +1,6 @@
 package com.xzjmyk.pm.activity.ui.erp.activity.oa;
 package com.xzjmyk.pm.activity.ui.erp.activity.oa;
 
 
+import android.content.Intent;
 import android.os.Bundle;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.Menu;
@@ -50,9 +51,10 @@ public class WorkLogsActivity extends BaseActivity {
     @Override
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
     public boolean onOptionsItemSelected(MenuItem item) {
         switch (item.getItemId()) {
         switch (item.getItemId()) {
-            case R.id.sreach:
-                break;
+//            case R.id.sreach:
+//                break;
             case R.id.add:
             case R.id.add:
+                startActivity(new Intent(WorkLogsActivity.this, AddLogActivity.class));
                 break;
                 break;
         }
         }
         return super.onOptionsItemSelected(item);
         return super.onOptionsItemSelected(item);

+ 2 - 2
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/fragment/SigninFragment.java

@@ -14,7 +14,7 @@ import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.base.EasyFragment;
 import com.xzjmyk.pm.activity.ui.base.EasyFragment;
 import com.xzjmyk.pm.activity.ui.calendar.cons.DPMode;
 import com.xzjmyk.pm.activity.ui.calendar.cons.DPMode;
 import com.xzjmyk.pm.activity.ui.calendar.views.DatePicker;
 import com.xzjmyk.pm.activity.ui.calendar.views.DatePicker;
-import com.xzjmyk.pm.activity.ui.erp.activity.oa.OA_AlarmaActivity;
+import com.xzjmyk.pm.activity.ui.erp.activity.oa.AlarmaActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.SigninActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.SigninActivity;
 import com.xzjmyk.pm.activity.util.CalendarUtils;
 import com.xzjmyk.pm.activity.util.CalendarUtils;
 import com.xzjmyk.pm.activity.util.TimeUtils;
 import com.xzjmyk.pm.activity.util.TimeUtils;
@@ -75,7 +75,7 @@ public class SigninFragment extends EasyFragment {
     @Override
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
     public boolean onOptionsItemSelected(MenuItem item) {
         if (item.getItemId() == R.id.oa_alarma) {
         if (item.getItemId() == R.id.oa_alarma) {
-            startActivity(new Intent(ct, OA_AlarmaActivity.class));
+            startActivity(new Intent(ct, AlarmaActivity.class));
         } else if (item.getItemId() == R.id.oa_rili) {
         } else if (item.getItemId() == R.id.oa_rili) {
             showDateDalog();
             showDateDalog();
         }
         }

+ 3 - 3
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/fragment/WorksFragment.java

@@ -16,7 +16,7 @@ import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.MainActivity;
 import com.xzjmyk.pm.activity.ui.MainActivity;
 import com.xzjmyk.pm.activity.ui.base.XutilsFragment;
 import com.xzjmyk.pm.activity.ui.base.XutilsFragment;
 import com.xzjmyk.pm.activity.ui.circle.BusinessCircleActivity;
 import com.xzjmyk.pm.activity.ui.circle.BusinessCircleActivity;
-import com.xzjmyk.pm.activity.ui.erp.activity.oa.OAActivity;
+import com.xzjmyk.pm.activity.ui.erp.activity.ErpMenActivity;
 import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
 import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
 import com.xzjmyk.pm.activity.util.PreferenceUtils;
 import com.xzjmyk.pm.activity.util.PreferenceUtils;
@@ -93,8 +93,8 @@ public class WorksFragment extends XutilsFragment implements View.OnClickListene
                 ViewUtil.WebLinks(ct, url, "我的商务");
                 ViewUtil.WebLinks(ct, url, "我的商务");
                 break;
                 break;
             case R.id.rl_uas_sys:
             case R.id.rl_uas_sys:
-//                ct.startActivity(new Intent(ct, ErpMenActivity.class));
-                        ct.startActivity(new Intent(ct, OAActivity.class));
+                ct.startActivity(new Intent(ct, ErpMenActivity.class));
+//                        ct.startActivity(new Intent(ct, OAActivity.class));
                 break;
                 break;
             case R.id.my_client_rl:
             case R.id.my_client_rl:
                 // ct.startActivity(new Intent(ct, ClientActivity.class));
                 // ct.startActivity(new Intent(ct, ClientActivity.class));

+ 2 - 2
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/message/SubscriptionActivity.java

@@ -70,7 +70,6 @@ public class SubscriptionActivity extends BaseActivity {
                     JSONArray array = object.getJSONArray("data");
                     JSONArray array = object.getJSONArray("data");
                     SubscriptionMessages = (ArrayList<SubscriptionMessage>) JSON.parseArray(array.toString(), SubscriptionMessage.class);
                     SubscriptionMessages = (ArrayList<SubscriptionMessage>) JSON.parseArray(array.toString(), SubscriptionMessage.class);
                     setData();
                     setData();
-                    Log.i("gongpengming", message);
                 } catch (JSONException e) {
                 } catch (JSONException e) {
                     e.printStackTrace();
                     e.printStackTrace();
                 }
                 }
@@ -109,7 +108,7 @@ public class SubscriptionActivity extends BaseActivity {
     private void initView() {
     private void initView() {
         listView = (PullToRefreshListView) findViewById(R.id.listview);
         listView = (PullToRefreshListView) findViewById(R.id.listview);
         listView.setMode(PullToRefreshBase.Mode.BOTH);
         listView.setMode(PullToRefreshBase.Mode.BOTH);
-        View aa=LayoutInflater.from(this).inflate(R.layout.subscrip_emptyview,null);
+        View aa = LayoutInflater.from(this).inflate(R.layout.subscrip_emptyview, null);
         getSupportActionBar().setCustomView(aa);
         getSupportActionBar().setCustomView(aa);
 
 
         listView.setEmptyView(aa);
         listView.setEmptyView(aa);
@@ -125,6 +124,7 @@ public class SubscriptionActivity extends BaseActivity {
                 newlong = calendar.getTimeInMillis();
                 newlong = calendar.getTimeInMillis();
                 loadNetData(newlong);//获取当天的网络数据
                 loadNetData(newlong);//获取当天的网络数据
             }
             }
+
             @Override
             @Override
             public void onPullUpToRefresh(PullToRefreshBase<ListView> refreshView) {
             public void onPullUpToRefresh(PullToRefreshBase<ListView> refreshView) {
                 isRef = false;
                 isRef = false;

+ 2 - 0
WeiChat/src/main/java/com/xzjmyk/pm/activity/view/CustomRatingBar.java

@@ -3,6 +3,7 @@ package com.xzjmyk.pm.activity.view;
 import android.content.Context;
 import android.content.Context;
 import android.util.AttributeSet;
 import android.util.AttributeSet;
 import android.widget.RelativeLayout;
 import android.widget.RelativeLayout;
+import android.widget.SeekBar;
 
 
 /**
 /**
  * Created by gongpm on 2016/7/6.
  * Created by gongpm on 2016/7/6.
@@ -16,5 +17,6 @@ public class CustomRatingBar extends RelativeLayout {
 
 
     public CustomRatingBar(Context context) {
     public CustomRatingBar(Context context) {
         this(context, null);
         this(context, null);
+
     }
     }
 }
 }

+ 106 - 0
WeiChat/src/main/res/layout/activity_add_log.xml

@@ -0,0 +1,106 @@
+<?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"
+    android:padding="2dp"
+    tools:context="com.xzjmyk.pm.activity.ui.erp.activity.oa.AddLogActivity">
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@drawable/oa_signin_tv_bg"
+        android:padding="20dp"
+        android:text="日志类型"
+        android:textColor="@color/text_main"
+        android:textSize="@color/text_main" />
+
+    <EditText
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@drawable/oa_signin_tv_bg"
+        android:gravity="left|start"
+        android:hint="填写工作总结"
+        android:minLines="4"
+        android:padding="5dp"
+        android:textColor="@color/text_hine"
+        android:textSize="@color/text_main" />
+
+    <EditText
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@drawable/oa_signin_tv_bg"
+        android:gravity="left|start"
+        android:hint="填写工作计划"
+        android:minLines="4"
+        android:padding="5dp"
+        android:textColor="@color/text_hine"
+        android:textSize="@color/text_main" />
+
+    <EditText
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@drawable/oa_signin_tv_bg"
+        android:gravity="left|start"
+        android:hint="填写心得体会"
+        android:minLines="4"
+        android:padding="5dp"
+        android:textColor="@color/text_hine"
+        android:textSize="@color/text_main" />
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="30dp"
+        android:background="@drawable/oa_signin_tv_bg"
+        android:padding="20dp"
+        android:text="选择点评人(默认指向自己领导)"
+        android:textColor="@color/text_main"
+        android:textSize="@color/text_main" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal">
+
+        <ImageView
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:src="@drawable/im_btn_emotion_bg" />
+
+
+        <ImageView
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:src="@drawable/im_btn_emotion_bg" />
+
+        <ImageView
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:src="@drawable/im_btn_emotion_bg" />
+
+        <ImageView
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:src="@drawable/im_btn_emotion_bg" />
+
+        <ImageView
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:src="@drawable/im_btn_emotion_bg" />
+
+        <ImageView
+            android:id="@+id/add"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:src="@drawable/actionbar_add_icon" />
+    </LinearLayout>
+
+</LinearLayout>

+ 1 - 1
WeiChat/src/main/res/layout/activity_oa__alarma.xml

@@ -4,7 +4,7 @@
     android:layout_width="match_parent"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
     android:orientation="vertical"
-    tools:context="com.xzjmyk.pm.activity.ui.erp.activity.oa.OA_AlarmaActivity">
+    tools:context=".ui.erp.activity.oa.AlarmaActivity">
 
 
 
 
 
 

+ 1 - 1
WeiChat/src/main/res/layout/activity_send_shuoshuo.xml

@@ -79,7 +79,7 @@
             android:id="@+id/release_btn"
             android:id="@+id/release_btn"
             android:layout_width="match_parent"
             android:layout_width="match_parent"
             android:layout_height="42dp"
             android:layout_height="42dp"
-            android:background="@drawable/button_orange_bg"
+            android:background="@drawable/bg_btn"
             android:text="@string/circle_release"
             android:text="@string/circle_release"
             android:textColor="@color/white"
             android:textColor="@color/white"
             android:textSize="16sp" />
             android:textSize="16sp" />

+ 0 - 2
WeiChat/src/main/res/layout/item_activity_worklogs.xml

@@ -54,7 +54,6 @@
         android:layout_below="@+id/avatar_img"
         android:layout_below="@+id/avatar_img"
         android:layout_marginTop="20dp"
         android:layout_marginTop="20dp"
         android:minLines="3" />
         android:minLines="3" />
-
     <RelativeLayout
     <RelativeLayout
         android:id="@+id/client_tag_rl"
         android:id="@+id/client_tag_rl"
         android:layout_width="match_parent"
         android:layout_width="match_parent"
@@ -64,7 +63,6 @@
         android:background="@color/item_color1"
         android:background="@color/item_color1"
         android:gravity="center_vertical"
         android:gravity="center_vertical"
         android:padding="5dp">
         android:padding="5dp">
-
         <TextView
         <TextView
             android:id="@+id/client_tag_tv"
             android:id="@+id/client_tag_tv"
             android:layout_width="wrap_content"
             android:layout_width="wrap_content"

+ 12 - 6
WeiChat/src/main/res/layout/p_msg_item_main_body.xml

@@ -81,6 +81,8 @@
                 android:textColor="@color/link_nick_name_color"
                 android:textColor="@color/link_nick_name_color"
                 android:textSize="@dimen/text_min" />
                 android:textSize="@dimen/text_min" />
 
 
+
+
             <ImageView
             <ImageView
                 android:id="@+id/operation_more_img"
                 android:id="@+id/operation_more_img"
                 android:layout_width="wrap_content"
                 android:layout_width="wrap_content"
@@ -91,13 +93,17 @@
                 android:contentDescription="@string/app_name" />
                 android:contentDescription="@string/app_name" />
         </RelativeLayout>
         </RelativeLayout>
 
 
-        <View
-            android:id="@+id/line"
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
+        <TextView
+            android:id="@+id/location_tv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/delete"
+            android:textColor="@color/text_hine"
+            android:textSize="@dimen/text_hine"
+            android:ellipsize="end"
             android:layout_marginTop="5dp"
             android:layout_marginTop="5dp"
-            android:background="@color/item_line"
-            android:visibility="gone" />
+            android:lines="1"
+            android:drawableLeft="@drawable/oa_signin" />
 
 
         <FrameLayout
         <FrameLayout
             android:layout_width="match_parent"
             android:layout_width="match_parent"

+ 10 - 0
WeiChat/src/main/res/layout/rating_bar_view.xml

@@ -4,4 +4,14 @@
     android:layout_height="match_parent">
     android:layout_height="match_parent">
 
 
 
 
+    <SeekBar
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:id="@+id/seekBar"
+        android:layout_alignParentBottom="true"
+        android:layout_alignParentRight="true"
+        android:layout_alignParentEnd="true"
+        android:layout_marginRight="300dp"
+        android:layout_marginEnd="300dp"
+        android:layout_marginBottom="133dp" />
 </RelativeLayout>
 </RelativeLayout>