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

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

@@ -12,7 +12,6 @@ import android.widget.Button;
 import android.widget.ImageView;
 import android.widget.Toast;
 
-import com.afollestad.materialdialogs.MaterialDialog;
 import com.alibaba.fastjson.JSON;
 import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
@@ -67,8 +66,8 @@ public class CustomCrashActivity extends Activity {
         stackTraceString = CustomActivityOnCrash.getAllErrorDetailsFromIntent(this,intent);
         if (stackTraceString != null){
             //TODO 发布版本隐藏
-            new MaterialDialog.Builder(this).content(stackTraceString)
-                    .build().show();
+//            new MaterialDialog.Builder(this).content(stackTraceString)
+//                    .build().show();
 //            try {
 //               // getCode();
 //            } catch (Exception e) {

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/MainActivity.java

@@ -212,7 +212,9 @@ public class MainActivity extends BaseActivity implements NetWorkObservable.NetW
                 }
                 changeFragment(mWorksFragment, TAG_NEARBY);
                 getSupportActionBar().setTitle(R.string.nearby);
-//                PreferenceUtils.putLong(mContext, TIME_MAIN, timeMin);
+                //TODO 当前隐藏新功能提醒红点
+                main_tab_three_tv.setVisibility(View.INVISIBLE);
+                PreferenceUtils.putInt(MainActivity.NEW_FUNCTION_NOTICE, 1);
             }
         /*	else if (checkedId == R.id.main_tab_four) {
                 if (mGroupChatFragment == null) {
@@ -642,9 +644,7 @@ public class MainActivity extends BaseActivity implements NetWorkObservable.NetW
         mMsgUnReadTv = (TextView) findViewById(R.id.main_tab_one_tv);
         unWorkReadTV = (TextView) findViewById(R.id.main_tab_five_tv);
         main_tab_three_tv = (TextView) findViewById(R.id.main_tab_three_tv);
-
-//        //TODO 当前隐藏新功能提醒红点
-        PreferenceUtils.putInt(MainActivity.NEW_FUNCTION_NOTICE, 1);
+        
         PushManager.resumeWork(MyApplication.getInstance());
 
         int new_function_notice = PreferenceUtils.getInt(MyApplication.getInstance(), MainActivity.NEW_FUNCTION_NOTICE);

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

@@ -110,7 +110,7 @@ public class OAActivity extends BaseActivity implements View.OnClickListener, Wo
     private TextView uok_task_num;
     @ViewInject(R.id.week_tv)
     private TextView week_tv;
-    
+
     @ViewInject(R.id.tv_signin_num)
     private TextView tv_signin_num;
     @ViewInject(R.id.tv_signout_num)

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

@@ -12,7 +12,6 @@ import android.widget.TextView;
 import com.lidroid.xutils.view.annotation.ViewInject;
 import com.xzjmyk.pm.activity.MyApplication;
 import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.ui.MainActivity;
 import com.xzjmyk.pm.activity.ui.base.XutilsFragment;
 import com.xzjmyk.pm.activity.ui.erp.activity.ErpMenActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.crm.ClientActivity;
@@ -22,7 +21,6 @@ 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.Constants;
 import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
-import com.xzjmyk.pm.activity.util.PreferenceUtils;
 import com.xzjmyk.pm.activity.util.ToastUtil;
 import com.xzjmyk.pm.activity.wxapi.ApiPlatform;
 import com.xzjmyk.pm.activity.wxapi.ApiUtils;
@@ -93,8 +91,7 @@ public class WorksFragment extends XutilsFragment implements View.OnClickListene
         goods_find.setOnClickListener(this);
         if(CommonUtil.getSharedPreferencesBoolean(MyApplication.getInstance(), Constants.new_oa)){
             tv_menu_oa.setVisibility(View.GONE);
-            tv_desc_business.setVisibility(View.GONE);
-            iv_business_desc.setVisibility(View.GONE);
+  
             tv_oa_desc.setVisibility(View.GONE);
             iv_desc_oa.setVisibility(View.GONE);
         }
@@ -102,31 +99,18 @@ public class WorksFragment extends XutilsFragment implements View.OnClickListene
             tv_business_num.setVisibility(View.GONE);
             tv_desc_business.setVisibility(View.GONE);
             iv_business_desc.setVisibility(View.GONE);
-            tv_oa_desc.setVisibility(View.GONE);
-            iv_desc_oa.setVisibility(View.GONE);
+          
         }
         
-        tv_menu_oa.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-             
-            }
-        });
-        
-        tv_business_num.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-             
-            }
-        });
+ 
         show_new_function_ll.setOnClickListener(this);
-        int new_function_notice = PreferenceUtils.getInt(MyApplication.getInstance(), MainActivity.NEW_FUNCTION_NOTICE);
-        if (new_function_notice == 1) {
-            show_new_function_ll.setVisibility(View.INVISIBLE);
-        } else {
-            //TODO 发布版本先隐藏
-            show_new_function_ll.setVisibility(View.INVISIBLE);
-        }
+      //  int new_function_notice = PreferenceUtils.getInt(MyApplication.getInstance(), MainActivity.NEW_FUNCTION_NOTICE);
+//        if (new_function_notice == 1) {
+//            show_new_function_ll.setVisibility(View.INVISIBLE);
+//        } else {
+//            //TODO 发布版本先隐藏
+//            show_new_function_ll.setVisibility(View.INVISIBLE);
+//        }
 
         if (platform){
             my_client_rl.setVisibility(View.GONE);
@@ -138,12 +122,12 @@ public class WorksFragment extends XutilsFragment implements View.OnClickListene
         super.onResume();
         //判断是否启用功能模块
         //  isStartNewApp(Constants.HTTP_SUCCESS_INIT);
-        int new_function_notice = PreferenceUtils.getInt(MyApplication.getInstance(), MainActivity.NEW_FUNCTION_NOTICE);
-        if (new_function_notice == 1) {
-            show_new_function_ll.setVisibility(View.INVISIBLE);
-        } else {
-            show_new_function_ll.setVisibility(View.VISIBLE);
-        }
+//        int new_function_notice = PreferenceUtils.getInt(MyApplication.getInstance(), MainActivity.NEW_FUNCTION_NOTICE);
+//        if (new_function_notice == 1) {
+//            show_new_function_ll.setVisibility(View.INVISIBLE);
+//        } else {
+//            show_new_function_ll.setVisibility(View.VISIBLE);
+//        }
     }
 
     @Override

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

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.handmark.pulltorefresh.library.PullToRefreshScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<com.handmark.pulltorefresh.library.PullToRefreshScrollView
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/oamain_ptrsv"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -33,30 +34,64 @@
                     android:layout_height="wrap_content"
                     android:orientation="horizontal"
                     android:paddingBottom="10dp">
-
-                    <TextView
-                        android:id="@+id/signin"
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
+                    <RelativeLayout
                         android:layout_weight="1"
-                        android:drawablePadding="@dimen/drawable_padding"
-                        android:drawableTop="@drawable/oa_1"
-                        android:gravity="center"
-                        android:text="打卡签到"
-                        android:textColor="@color/white"
-                        android:layout_marginTop="2dp"/>
-
-                    <TextView
-                        android:id="@+id/outoffice"
                         android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="2dp"
+                        android:layout_height="match_parent">
+                        <TextView
+                            android:id="@+id/tv_signin_num"
+                            android:layout_width="10dp"
+                            android:layout_height="10dp"
+                            android:layout_marginRight="10dp"
+                            android:background="@drawable/hongdian"
+                            android:layout_gravity="top|right"
+                            android:gravity="center"
+                            android:text=""
+                            android:textColor="@android:color/white"
+                            android:textSize="10.0dip"
+                            android:layout_alignParentRight="true"
+                            android:layout_alignParentEnd="true"
+                            android:layout_alignTop="@+id/signin" />
+                        <TextView
+                            android:id="@+id/signin"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:drawablePadding="@dimen/drawable_padding"
+                            android:drawableTop="@drawable/oa_1"
+                            android:layout_centerInParent="true"
+                            android:text="打卡签到"
+                            android:textColor="@color/white"
+                            android:layout_marginTop="2dp"/>
+                    </RelativeLayout>
+                    <RelativeLayout
                         android:layout_weight="1"
-                        android:drawablePadding="@dimen/drawable_padding"
-                        android:drawableTop="@drawable/oa_2"
-                        android:gravity="center"
-                        android:text="外勤签到"
-                        android:textColor="@color/white" />
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent">
+                        <TextView
+                            android:id="@+id/tv_signout_num"
+                            android:layout_width="10dp"
+                            android:layout_height="10dp"
+                            android:layout_marginRight="10dp"
+                            android:background="@drawable/hongdian"
+                            android:layout_gravity="top|right"
+                            android:layout_alignParentRight="true"
+                            android:gravity="center"
+                            android:text=""
+                            android:textColor="@android:color/white"
+                            android:textSize="10.0dip"
+                            />
+                        <TextView
+                            android:id="@+id/outoffice"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="2dp"
+                            android:gravity="center"
+                            android:drawablePadding="@dimen/drawable_padding"
+                            android:drawableTop="@drawable/oa_2"
+                            android:layout_centerInParent="true"
+                            android:text="外勤签到"
+                            android:textColor="@color/white" />
+                    </RelativeLayout>
 
                     <TextView
                         android:id="@+id/worklog"