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

WeiChat/build.gradle

@@ -113,14 +113,14 @@ dependencies {
     compile('com.facebook.stetho:stetho:1.4.1') {
         force = true
     }
-    compile 'de.hdodenhof:circleimageview:2.1.0'
-    compile 'com.alibaba:fastjson:1.2.24'
     compile project(':library-refreshlayout')
     compile files('src/main/jniLibs/pushservice-5.3.0.99.jar')
     compile files('libs/lite-orm-1.7.0.jar')
     compile files('libs/Msc.jar')
     compile files('libs/zhy_treeview.jar')
     compile 'com.alibaba:fastjson:1.2.24'
+    compile 'de.hdodenhof:circleimageview:2.1.0'
+    compile 'com.alibaba:fastjson:1.2.24'
     compile 'joda-time:joda-time:2.9.4'
     compile 'com.readystatesoftware.systembartint:systembartint:1.0.3'
     compile 'com.android.support:support-v4:22.2.1'

WeiChat/src/main/AndroidManifest.xml

@@ -597,10 +597,10 @@
         <activity android:name=".ui.erp.activity.oa.OAMainActivity" />
 
         <!-- 分享开始   umeng api key -->
-        <!--TODO 分享Id   android:value="57ea27bb67e58e088c003bbf" -->
+        <!--TODO Bitliker   android:value="574504a167e58eec520017df" -->
         <meta-data
             android:name="UMENG_APPKEY"
-            android:value="574504a167e58eec520017df" />
+            android:value="57ea27bb67e58e088c003bbf" />
         <!-- weixin -->
         <activity
             android:name=".wxapi.WXEntryActivity"
@@ -875,12 +875,14 @@
             android:name=".ui.erp.activity.PlatLeaveAddActivity"
             android:label="请假单"
             android:windowSoftInputMode="adjustPan" />
-        <activity android:name=".ui.platform.activity.ChangeDealManActivity"
-            android:label="导航"/>
-        <activity android:name=".ui.platform.task.TaskAddErpActivity"/>
-        <activity android:name=".ui.erp.activity.oa.PlatContactAddPeopleActivity"
+        <activity
+            android:name=".ui.platform.activity.ChangeDealManActivity"
+            android:label="导航" />
+        <activity android:name=".ui.platform.task.TaskAddErpActivity" />
+        <activity
+            android:name=".ui.erp.activity.oa.PlatContactAddPeopleActivity"
             android:label="新增人员"
-            android:windowSoftInputMode="adjustPan"/>
+            android:windowSoftInputMode="adjustPan" />
         <activity
             android:name=".ui.erp.activity.oa.NavigationActivity"
             android:label="导航" />
@@ -913,6 +915,8 @@
 
         <activity android:name=".ui.erp.activity.oa.FlihtsDateSelectActivity"
             android:label="选择日期"/>
+
+        <activity android:name=".ui.erp.activity.ADActivity"/>
     </application>
 
 </manifest>

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

@@ -155,7 +155,7 @@ public class MyApplication extends Application {
     }
 
     private void initUmengStatistics() {
-        MobclickAgent.UMAnalyticsConfig config = new MobclickAgent.UMAnalyticsConfig(this, "574504a167e58eec520017df",
+        MobclickAgent.UMAnalyticsConfig config = new MobclickAgent.UMAnalyticsConfig(this, "57ea27bb67e58e088c003bbf",
                 "baidu", MobclickAgent.EScenarioType.E_UM_NORMAL);
         MobclickAgent.startWithConfigure(config);
     }

WeiChat/src/main/java/com/xzjmyk/pm/activity/db/DatabaseManager.java

@@ -4,6 +4,7 @@ import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteOpenHelper;
 
 import com.xzjmyk.pm.activity.ui.erp.db.DBOpenHelper;
+import com.xzjmyk.pm.activity.ui.erp.util.LogUtil;
 
 import java.util.concurrent.atomic.AtomicInteger;
 
@@ -24,6 +25,7 @@ public class DatabaseManager {
 
     public static synchronized DatabaseManager getInstance() {
         if (instance == null) {
+            LogUtil.d("DatabaseManager init");
             initializeInstance(DBOpenHelper.getInstance());
         }
         return instance;

WeiChat/src/main/java/com/xzjmyk/pm/activity/db/dao/InAndExitTimeDao.java

@@ -14,10 +14,9 @@ import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
 import java.util.ArrayList;
 import java.util.List;
 
-/**
- * Created by FANGlh on 2017/2/10.
- * function:
- */
+
+ 
+
 public class InAndExitTimeDao {
     private static InAndExitTimeDao instance;
     private DBOpenHelper helper = null;

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

@@ -8,10 +8,8 @@ import android.text.TextUtils;
 import android.view.View;
 import android.view.animation.Animation;
 import android.view.animation.AnimationUtils;
-import android.widget.Button;
 import android.widget.RelativeLayout;
 
-import com.alibaba.fastjson.JSON;
 import com.android.volley.Response;
 import com.android.volley.VolleyError;
 import com.xzjmyk.pm.activity.AppConfig;
@@ -24,8 +22,8 @@ import com.xzjmyk.pm.activity.db.dao.UserDao;
 import com.xzjmyk.pm.activity.helper.LoginHelper;
 import com.xzjmyk.pm.activity.sp.UserSp;
 import com.xzjmyk.pm.activity.ui.account.LoginActivity;
-import com.xzjmyk.pm.activity.ui.account.RegisterActivity;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
+import com.xzjmyk.pm.activity.ui.erp.activity.ADActivity;
 import com.xzjmyk.pm.activity.ui.erp.util.LogUtil;
 import com.xzjmyk.pm.activity.ui.me.TimeStatisticsActivity;
 import com.xzjmyk.pm.activity.util.DeviceInfoUtil;
@@ -46,8 +44,7 @@ import java.util.HashMap;
  */
 public class SplashActivity extends BaseActivity {
     private RelativeLayout mSelectLv;
-    private Button mSelectLoginBtn;
-    private Button mSelectRegBtn;
+    private final String IS_FIRST = "IS_FIRST";
 
     private long mStartTimeMs;// 记录进入该界面时间，保证至少在该界面停留3秒
     private boolean mConfigReady = false;// 配置获取成功
@@ -56,28 +53,10 @@ public class SplashActivity extends BaseActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_splash);
-
         mStartTimeMs = System.currentTimeMillis();
-
         mSelectLv = (RelativeLayout) findViewById(R.id.select_lv);
-        mSelectLoginBtn = (Button) findViewById(R.id.select_login_btn);
-        mSelectRegBtn = (Button) findViewById(R.id.select_register_btn);
-//        mSelectLoginBtn.setOnClickListener(new View.OnClickListener() {
-//            @Override
-//            public void onClick(View v) {
-//                startActivity(new Intent(mContext, LoginActivity.class));
-//            }
-//        });
-        mSelectRegBtn.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                startActivity(new Intent(mContext, RegisterActivity.class));
-            }
-        });
         mSelectLv.setVisibility(View.INVISIBLE);
         initConfig();// 初始化配置
-        
-
     }
 
     @Override
@@ -97,14 +76,11 @@ public class SplashActivity extends BaseActivity {
         StringJsonObjectRequest<ConfigBean> request = new StringJsonObjectRequest<ConfigBean>(AppConfig.CONFIG_URL, new Response.ErrorListener() {
             @Override
             public void onErrorResponse(VolleyError arg0) {
-                LogUtil.d("读取网络配置失败！"+AppConfig.CONFIG_URL);
-                LogUtil.d(JSON.toJSONString(arg0));
                 setConfig(new ConfigBean());// 读取网络配置失败，使用默认配置
             }
         }, new StringJsonObjectRequest.Listener<ConfigBean>() {
             @Override
             public void onResponse(ObjectResult<ConfigBean> result) {
-                LogUtil.d(JSON.toJSONString(result));
                 ConfigBean configBean = null;
                 if (result == null || result.getResultCode() != Result.CODE_SUCCESS || result.getData() == null) {
                     configBean = new ConfigBean();// 读取网络配置失败，使用默认配置
@@ -119,18 +95,14 @@ public class SplashActivity extends BaseActivity {
 
     private void setConfig(ConfigBean configBean) {
         MyApplication.getInstance().setConfig(AppConfig.initConfig(this, configBean));// 初始化配置
-        mConfigReady = true;
         ready();
     }
 
     private void ready() {
-        if (!mConfigReady) {
-            return;
-        }
         long currentTimeMs = System.currentTimeMillis();
         int useTime = (int) (currentTimeMs - mStartTimeMs);
         int delayTime = useTime > 2000 ? 0 : 2000 - useTime;
-
+        //两秒内请求不对进入
         new Handler().postDelayed(new Runnable() {
             @Override
             public void run() {
@@ -153,7 +125,11 @@ public class SplashActivity extends BaseActivity {
                 break;
             case LoginHelper.STATUS_USER_TOKEN_OVERDUE://2
             case LoginHelper.STATUS_USER_SIMPLE_TELPHONE:
-                intent.setClass(mContext, LoginActivity.class);
+                boolean isFirst = PreferenceUtils.getBoolean(IS_FIRST, true);
+                if (isFirst) {
+                    intent.setClass(mContext, ADActivity.class);
+                } else
+                    intent.setClass(mContext, LoginActivity.class);
                 break;
             case LoginHelper.STATUS_NO_USER://0
             default:
@@ -167,7 +143,6 @@ public class SplashActivity extends BaseActivity {
     private void jump2() {
         boolean idIsEmpty = TextUtils.isEmpty(UserSp.getInstance(this).getUserId(""));
         boolean telephoneIsEmpty = TextUtils.isEmpty(UserSp.getInstance(this).getTelephone(null));
-
         if (!idIsEmpty && !telephoneIsEmpty) {// 用户标识都不为空，那么就能代表一个完整的用户
             // 进入之前，加载本地已经存在的数据
             String userId = UserSp.getInstance(this).getUserId("");
@@ -196,7 +171,6 @@ public class SplashActivity extends BaseActivity {
             jump();
             return;
         }
-
         // 加密之后的密码
         final String requestTag = "login";
         HashMap<String, String> params = new HashMap<String, String>();
@@ -237,10 +211,10 @@ public class SplashActivity extends BaseActivity {
                     String nowtime = TimeUtils.f_long_2_str(System.currentTimeMillis());
                     String saved_time = PreferenceUtils.getString(MyApplication.getInstance(), TimeStatisticsActivity.Login_In);
 
-                    if (!TextUtils.isEmpty(saved_time)){
-                        PreferenceUtils.putString(TimeStatisticsActivity.Login_In,saved_time + "," + nowtime);
-                    }else {
-                        PreferenceUtils.putString(TimeStatisticsActivity.Login_In,nowtime);
+                    if (!TextUtils.isEmpty(saved_time)) {
+                        PreferenceUtils.putString(TimeStatisticsActivity.Login_In, saved_time + "," + nowtime);
+                    } else {
+                        PreferenceUtils.putString(TimeStatisticsActivity.Login_In, nowtime);
                     }
                 } else {// 登录失败
                     jump();
@@ -255,7 +229,12 @@ public class SplashActivity extends BaseActivity {
     // 停留在此界面
     private void stay() {
         mSelectLv.setVisibility(View.GONE);
-        startActivity(new Intent(mContext, LoginActivity.class));
+        boolean isFirst = PreferenceUtils.getBoolean(IS_FIRST, true);
+        if (isFirst) {
+            startActivity(new Intent(mContext, ADActivity.class));
+            finish();
+        } else
+            startActivity(new Intent(mContext, LoginActivity.class));
         Animation anim = AnimationUtils.loadAnimation(this, R.anim.alpha_in);
         mSelectLv.startAnimation(anim);
     }

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/account/LoginActivity.java

@@ -20,6 +20,7 @@ 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.erp.net.ViewUtil;
+import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.LogUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
 import com.xzjmyk.pm.activity.ui.me.TimeStatisticsActivity;
@@ -59,6 +60,14 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_login);
         initView();
+       /* for (int i=0;i<100000;i++){
+             new Thread(new Runnable() {
+                 @Override
+                 public void run() {
+                     DatabaseManager.getInstance().openDatabase();
+                 }
+             }).start();
+        }*/
     }
 
     @Override
@@ -83,11 +92,14 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
         mHeader = (CircleImageView) findViewById(R.id.iv_head);
         tv_findPwd= (TextView) findViewById(R.id.tv_findPwd);
         tv_register= (TextView) findViewById(R.id.tv_register);
-        if (MyApplication.getInstance().mLoginUser.getTelephone() != null && MyApplication.getInstance().mLoginUser.getTelephone().length() > 0) {
-            mPhoneNumberEdit.setText(MyApplication.getInstance().mLoginUser.getTelephone());
+        if (CommonUtil.getSharedPreferences(this,"user_phone") != null &&CommonUtil.getSharedPreferences(this, "user_phone").length() > 0) {
+            mPhoneNumberEdit.setText(CommonUtil.getSharedPreferences(this, "user_phone"));
+            mPhoneNumberEdit.setFocusable(false);
+        
         }
         if (PreferenceUtils.getString(this, PASS_WORDS) != null && PreferenceUtils.getString(this, PASS_WORDS).length() > 0) {
             mPasswordEdit.setText(PreferenceUtils.getString(this, PASS_WORDS));
+            mPasswordEdit.setFocusable(false);
         }
         //登陆账号
         findViewById(R.id.login_btn).setOnClickListener(this);
@@ -221,11 +233,11 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
         ViewUtil.LoginTask(phone, password, mContext);
     }
 
-   public void onRegister(View view){
-        ViewUtil.webLinks(mContext, "https://account.ubtob.com/sso/register", "新用户注册");
-    }
-    
-    public void onFindPWD(View view){
-        ViewUtil.webLinks(mContext, "https://account.ubtob.com/user/pwd?appId=home&returnURL=http%3A%2F%2Fwww.ubtob.com%2F", "密码找回");
-    }
+//   public void onRegister(View view){
+//        ViewUtil.webLinks(mContext, "https://account.ubtob.com/sso/register", "新用户注册");
+//    }
+//    
+//    public void onFindPWD(View view){
+//        ViewUtil.webLinks(mContext, "https://account.ubtob.com/user/pwd?appId=home&returnURL=http%3A%2F%2Fwww.ubtob.com%2F", "密码找回");
+//    }
 }

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

@@ -0,0 +1,159 @@
+package com.xzjmyk.pm.activity.ui.erp.activity;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.annotation.IdRes;
+import android.support.v4.view.PagerAdapter;
+import android.support.v4.view.ViewPager;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.RadioButton;
+import android.widget.RadioGroup;
+
+import com.lidroid.xutils.ViewUtils;
+import com.lidroid.xutils.util.LogUtils;
+import com.lidroid.xutils.view.annotation.ViewInject;
+import com.xzjmyk.pm.activity.R;
+import com.xzjmyk.pm.activity.ui.account.LoginActivity;
+import com.xzjmyk.pm.activity.ui.base.BaseActivity;
+import com.xzjmyk.pm.activity.util.PreferenceUtils;
+
+
+/**
+ * 广告页
+ */
+public class ADActivity extends BaseActivity {
+    private final String IS_FIRST = "IS_FIRST";
+
+    private final int[] IDS = {R.drawable.index_a, R.drawable.index_b, R.drawable.index_c, R.drawable.index_d};
+    @ViewInject(R.id.ad_vp)
+    private ViewPager ad_vp;
+    @ViewInject(R.id.rg)
+    private RadioGroup rg;
+    @ViewInject(R.id.rb1)
+    private RadioButton rb1;
+    @ViewInject(R.id.rb2)
+    private RadioButton rb2;
+    @ViewInject(R.id.rb3)
+    private RadioButton rb3;
+    @ViewInject(R.id.rb4)
+    private RadioButton rb4;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_ad);
+        ViewUtils.inject(this);
+        getSupportActionBar().hide();
+        initView();
+
+    }
+
+    private void initView() {
+        ad_vp.setAdapter(new MViewPagerAdapter());
+        ad_vp.addOnPageChangeListener(new ViewPager.OnPageChangeListener() {
+            @Override
+            public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
+                if (position == (IDS.length - 1)) {
+
+                }
+            }
+
+            @Override
+            public void onPageSelected(int position) {
+                switch (position) {
+                    case 0:
+                        rb1.setChecked(true);
+//                        btn.setVisibility(View.GONE);
+                        break;
+                    case 1:
+                        rb2.setChecked(true);
+//                        btn.setVisibility(View.GONE);
+                        break;
+                    case 2:
+                        rb3.setChecked(true);
+//                        btn.setVisibility(View.GONE);
+                        break;
+                    case 3:
+                        rb4.setChecked(true);
+//                        btn.setVisibility(View.VISIBLE);
+                        break;
+                }
+            }
+
+            @Override
+            public void onPageScrollStateChanged(int state) {
+
+            }
+        });
+        rg.setOnCheckedChangeListener(new RadioGroup.OnCheckedChangeListener() {
+            @Override
+            public void onCheckedChanged(RadioGroup group, @IdRes int checkedId) {
+                int item = 0;
+                switch (checkedId) {
+                    case R.id.rb1:
+                        item = 0;
+                        LogUtils.i("R.id.rb1");
+                        break;
+                    case R.id.rb2:
+                        item = 1;
+                        LogUtils.i("R.id.rb2");
+                        break;
+                    case R.id.rb3:
+                        item = 2;
+                        LogUtils.i("R.id.rb3");
+                        break;
+                    case R.id.rb4:
+                        item = 3;
+                        LogUtils.i("R.id.rb4");
+                        break;
+                }
+                ad_vp.setCurrentItem(item);
+
+            }
+        });
+
+
+    }
+
+    private void start2Next() {
+        startActivity(new Intent(this, LoginActivity.class));
+        PreferenceUtils.putBoolean(IS_FIRST, false);
+        finish();
+    }
+
+    private class MViewPagerAdapter extends PagerAdapter {
+        @Override
+        public int getCount() {
+            return IDS.length;
+        }
+
+        @Override
+        public boolean isViewFromObject(View view, Object object) {
+            return view == object;
+        }
+
+        @Override
+        public void destroyItem(ViewGroup container, int position, Object object) {
+            container.removeView((View) object);
+        }
+
+        @Override
+        public Object instantiateItem(ViewGroup container, int position) {
+            ImageView image = new ImageView(ADActivity.this);
+            image.setImageResource(IDS[position]);
+            image.setScaleType(ImageView.ScaleType.CENTER_CROP);
+            if (position == 3) {
+                image.setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        start2Next();
+                    }
+                });
+            }
+            container.addView(image);
+            return image;
+        }
+    }
+}

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

@@ -148,9 +148,9 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
                         for (int i = 0; i < forms.size(); i++) {
                             JSONObject items = forms.getJSONObject(i);
                             //控制分组数据下无数据，不显示
-                            if(items.getIntValue("mfd_isdefault")==-1){
+                            //if(items.getIntValue("mfd_isdefault")==-1){
                                set.add(items.getString("fd_group"));
-                            }
+                           // }
 
                         }
                         //过滤分组
@@ -1267,7 +1267,7 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
                                         .equals(".") && CommonUtil.countStr(s.toString(), ".") == 1) {
                                     falg = false;
                                 }
-                                if (!RegexUtil.checkRegex(s.toString(), "^[0-9]+(.[0-9]{1})?$") && falg) {
+                                if (!RegexUtil.checkRegex(s.toString(), "^[0-9]+(.[0-9]{1,2})?$") && falg) {
                                     editText.setText(text);
                                 } else {
                                     data.setValue(s.toString());
@@ -2293,6 +2293,20 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
      * @author：Arison on 2016/11/22
      */
     public void updateData(String formStore, String gridStore) {
+        if ("{}".equals(formStore) && "{}".equals(gridStore)) {
+            ToastMessage("界面字段为空，不能提交！");
+            return;
+        }
+        if ("[]".equals(gridStore)) {
+            ToastMessage("单据明细必填字段缺失，请联系管理员！");
+            if (!caller.equals("MainTain")) {
+                return;
+            }
+        }
+        if ("{}".equals(formStore) || "{".equals(formStore)) {
+            ToastMessage("单据主表必填字段缺失，请联系管理员！");
+            return;
+        }
         progressDialog.show();
         btn_update.setEnabled(false);
         String url = Constants.getAppBaseUrl(ct) + "/mobile/commonUpdate.action";

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

@@ -293,7 +293,7 @@ public class ChangeMobileActivity extends BaseActivity {
     /*申请申诉*/
     private void suppleSignin(String message) {
         progressDialog.show();
-        String url = CommonUtil.getSharedPreferences(ct, "erp_baseurl") + "mobile/oa/saveAndSubmitMobileSignCard.action";
+        String url = "mobile/oa/saveAndSubmitMobileSignCard.action";
         Map<String, Object> param = new HashMap<>();
         param.put("caller", caller);
         Map<String, Object> params = new HashMap<>();
@@ -318,7 +318,6 @@ public class ChangeMobileActivity extends BaseActivity {
                 .setParam(param)
                 .setUrl(url)
                 .bulid();
-
         OAHttpHelper.getInstance().requestHttp(request, new OnHttpResultListener() {
             @Override
             public void result(int what, boolean isJSON, String message, Bundle bundle) {

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

@@ -52,6 +52,7 @@ import com.xzjmyk.pm.activity.ui.erp.model.Employees;
 import com.xzjmyk.pm.activity.ui.erp.model.oa.OAModel;
 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.JsonValidator;
 import com.xzjmyk.pm.activity.ui.erp.util.ListUtils;
 import com.xzjmyk.pm.activity.ui.erp.util.LogUtil;
@@ -109,6 +110,12 @@ 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)
+    private TextView  tv_signout_num;
+    
     @ViewInject(R.id.oa_listview)
     private MyListView oa_listview;
 
@@ -526,6 +533,27 @@ public class OAActivity extends BaseActivity implements View.OnClickListener, Wo
             meeting.setVisibility(View.INVISIBLE);
             special_attendance.setVisibility(View.INVISIBLE);
         }
+
+        if(CommonUtil.getSharedPreferencesBoolean(MyApplication.getInstance(), Constants.new_signin)){
+            tv_signin_num.setVisibility(View.GONE);
+        }
+        if(CommonUtil.getSharedPreferencesBoolean(MyApplication.getInstance(), Constants.new_signout)){
+            tv_signout_num.setVisibility(View.GONE);
+        }
+
+        tv_signin_num.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+               
+            }
+        });
+
+        tv_signout_num.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+               
+            }
+        });
     }
 
     @Override
@@ -794,6 +822,8 @@ public class OAActivity extends BaseActivity implements View.OnClickListener, Wo
                 boolean isAdmin = PreferenceUtils.getBoolean(AppConfig.IS_ADMIN, false);
                 intent.putExtra(AppConfig.IS_ADMIN, isAdmin);//上传管理员状态
                 startActivity(intent);
+                CommonUtil.setSharedPreferences(MyApplication.getInstance(), Constants.new_signin, true);
+                tv_signin_num.setVisibility(View.GONE);
                 break;
             case R.id.outoffice:  //外勤签到
                 boolean is = PreferenceUtils.getBoolean(AppConfig.AUTO_MISSION, false);
@@ -806,6 +836,8 @@ public class OAActivity extends BaseActivity implements View.OnClickListener, Wo
                 boolean isAdmain = PreferenceUtils.getBoolean(AppConfig.IS_ADMIN, false);
                 intent.putExtra(AppConfig.IS_ADMIN, isAdmain);//上传管理员状态
                 startActivityForResult(intent, 0x21);
+                CommonUtil.setSharedPreferences(MyApplication.getInstance(), Constants.new_signout, true);
+                tv_signout_num.setVisibility(View.GONE);
                 break;
             case R.id.meeting://会议管理
                 startActivity(new Intent(activity, MeetingActivity.class));

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

@@ -3,8 +3,8 @@ package com.xzjmyk.pm.activity.ui.erp.fragment;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.util.Log;
 import android.view.View;
+import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
@@ -20,6 +20,7 @@ import com.xzjmyk.pm.activity.ui.erp.activity.oa.OAActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.StatisticsActivity;
 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;
@@ -35,6 +36,22 @@ public class WorksFragment extends XutilsFragment implements View.OnClickListene
     private static final String TIME_MILL = "TIMEMILL";
     private String TAG = "WorksFragment";
     private Context ct;
+
+    @ViewInject(R.id.tv_business_num)
+    private TextView tv_business_num;
+    @ViewInject(R.id.tv_menu_oa)
+    private TextView  tv_menu_oa;
+
+    @ViewInject(R.id.tv_oa_desc)
+    private TextView tv_oa_desc;
+    @ViewInject(R.id.tv_desc_business)
+    private TextView  tv_desc_business;
+
+    @ViewInject(R.id.iv_business_desc)
+    private ImageView iv_business_desc;
+    @ViewInject(R.id.iv_desc_oa)
+    private ImageView iv_desc_oa;
+    
     @ViewInject(R.id.setting_rl)
     private RelativeLayout setting_rl;
     @ViewInject(R.id.rl_uas_sys)
@@ -74,6 +91,26 @@ public class WorksFragment extends XutilsFragment implements View.OnClickListene
         my_data_rl.setOnClickListener(this);
         my_client_rl.setOnClickListener(this);
         goods_find.setOnClickListener(this);
+        if(CommonUtil.getSharedPreferencesBoolean(MyApplication.getInstance(), Constants.new_oa)){
+            tv_menu_oa.setVisibility(View.GONE);
+        }
+        if(CommonUtil.getSharedPreferencesBoolean(MyApplication.getInstance(), Constants.new_business)){
+            tv_business_num.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) {
@@ -114,12 +151,20 @@ public class WorksFragment extends XutilsFragment implements View.OnClickListene
                 } else {
                     url = "http://uas.ubtob.com/authen?b_username=" + phone + "&b_password=" + password + "&b_enuu=" + b_enuu;
                 }
-                Log.i(TAG, "onClick:" + url);
+                CommonUtil.setSharedPreferences(MyApplication.getInstance(),Constants.new_business,true);
+                
+                tv_business_num.setVisibility(View.GONE);
+                tv_desc_business.setVisibility(View.GONE);
+                iv_business_desc.setVisibility(View.GONE);
                 ViewUtil.webLinks(ct, url, "我的商务");
                 break;
             case R.id.rl_uas_sys:
                 if (falg.equals("1")) {
                     getActivity().startActivityForResult(new Intent(ct, OAActivity.class), 0x11);
+                    CommonUtil.setSharedPreferences(MyApplication.getInstance(), Constants.new_oa, true);
+                    tv_menu_oa.setVisibility(View.GONE);
+                    tv_oa_desc.setVisibility(View.GONE);
+                    iv_desc_oa.setVisibility(View.GONE);
                 } else {
                     startActivity(new Intent(ct, ErpMenActivity.class));
                 }

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

@@ -280,7 +280,7 @@ public class MessagePresenter implements OnHttpResultListener {
                     return;
                 }
                 String ids = object.getString("ids");
-                if (StringUtils.isEmpty(ids))
+                if (!StringUtils.isEmpty(ids))
                     postReadNews(ids);
                 JSONArray array = object.getJSONArray("listdata");
                 handlerNewsFormErp(array);

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

@@ -288,4 +288,11 @@ public class Constants {
     public final static int SUCCESS_ERP = 5;//ERP登录成功
     public final static int SUCCESS_INITDATA = 7;
     public final static int FIRST_MSG_REQUEST = 17022801;
+    
+    //新功能红点
+    public final static String  new_dingyue="dingyue";
+    public final static String  new_signin="signin";
+    public final static String  new_signout="signout";
+    public final static String  new_oa="oa_menu";
+    public final static String  new_business="business";
 }

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/view/calender/WeekBarView.java

@@ -10,6 +10,7 @@ import android.util.DisplayMetrics;
 import android.view.View;
 
 import com.xzjmyk.pm.activity.R;
+import com.xzjmyk.pm.newpedo.utils.TimeUtil;
 
 
 /**

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/message/MessageFragment.java

@@ -21,6 +21,7 @@ import com.iflytek.cloud.ui.RecognizerDialogListener;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
 import com.roamer.slidelistview.SlideListView;
+import com.xzjmyk.pm.activity.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.audio.voicerecognition.JsonParser;
 import com.xzjmyk.pm.activity.audio.voicerecognition.VoiceToWord;
@@ -36,6 +37,7 @@ import com.xzjmyk.pm.activity.ui.erp.entity.EditChangeListener;
 import com.xzjmyk.pm.activity.ui.erp.presenter.MessagePresenter;
 import com.xzjmyk.pm.activity.ui.erp.presenter.imp.IMessageView;
 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.ListUtils;
 import com.xzjmyk.pm.activity.ui.erp.util.LogUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
@@ -78,6 +80,8 @@ public class MessageFragment extends EasyFragment implements IMessageView, Recog
     private RelativeLayout subscribe_rl;
     public static final int REQUESTCODE = 0xa1;
     private Comparator<BaseSortModel<Friend>> comparator;
+    private TextView dingyue_num;
+    private TextView tv_dingyue_desc;
 
     @Override
     public void onAttach(Context context) {
@@ -181,9 +185,18 @@ public class MessageFragment extends EasyFragment implements IMessageView, Recog
         schedule_time_tv = (TextView) view.findViewById(R.id.schedule_time_tv);//审批流
         waitting_work_time_tv = (TextView) view.findViewById(R.id.waitting_work_time_tv);//待办工作
         subscribe_time_tv = (TextView) view.findViewById(R.id.subscribe_time_tv);//我的订阅
+
+        dingyue_num=  (TextView) view.findViewById(R.id.tv_dingYue_num);//订阅红点
+        tv_dingyue_desc=  (TextView) view.findViewById(R.id.tv_dingyue_desc);//订阅红点
+        if(CommonUtil.getSharedPreferencesBoolean(MyApplication.getInstance(), Constants.new_dingyue)){
+            dingyue_num.setVisibility(View.GONE);
+            tv_dingyue_desc.setVisibility(View.GONE);
+        }
         view.findViewById(R.id.schedule_rl).setOnClickListener(this);//审批流
         view.findViewById(R.id.waitting_work_rl).setOnClickListener(this);//待办工作
         view.findViewById(R.id.subscribe_rl).setOnClickListener(this);//我的订阅
+     
+        
 //        view.findViewById(R.id.notice_rl).setOnClickListener(this); //新闻通知
         if (platform) {
             subscribe_rl.setVisibility(View.GONE);
@@ -278,6 +291,9 @@ public class MessageFragment extends EasyFragment implements IMessageView, Recog
             case R.id.subscribe_rl://我的订阅
                 presenter.setSubReadTime(TimeUtils.s_long_2_str(System.currentTimeMillis()));
                 startActivity(new Intent(mContext, Subscription2Activity.class));
+                CommonUtil.setSharedPreferences(MyApplication.getInstance(), Constants.new_dingyue, true);
+                dingyue_num.setVisibility(View.GONE);
+                tv_dingyue_desc.setVisibility(View.GONE);
                 break;
             case R.id.msg_delete_tv://删除
                 break;

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/platform/task/TaskB2BActivity.java

@@ -57,6 +57,8 @@ import com.xzjmyk.pm.activity.wxapi.ApiConfig;
 import com.xzjmyk.pm.activity.wxapi.ApiUtils;
 
 import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
@@ -65,6 +67,8 @@ import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import static com.xzjmyk.pm.activity.ui.erp.util.CommonUtil.getEmcode;
+
 public class TaskB2BActivity extends BaseActivity implements RecognizerDialogListener, View.OnClickListener {
 
 
@@ -122,6 +126,7 @@ public class TaskB2BActivity extends BaseActivity implements RecognizerDialogLis
                             JSONObject item = data.getJSONObject(i);
                             process.setTaskid(String.valueOf(item.get("id")));//id
                             process.setRecorder(item.getString("recorder"));//发起人
+                            process.setRecorderid(item.getString("recordercode"));//发起人
                             process.setStatus(item.getString("status"));//状态
                             process.setMainname(item.getString("status"));//状态
                             process.setTaskname(item.getString("taskname"));//名称
@@ -153,6 +158,8 @@ public class TaskB2BActivity extends BaseActivity implements RecognizerDialogLis
                     JSONArray data = dataroot.getJSONArray("listdata");
                     LogUtil.prinlnLongMsg("isendresult", isendresult);
                     if (!ListUtils.isEmpty(data)) {
+                        String emCode = CommonUtil.getEmcode();
+                        boolean isref = false;
                         for (int i = 0; i < data.size(); i++) {
 //                            "detail":"测试",
 //                                    "doman":"移动测试",
@@ -185,6 +192,11 @@ public class TaskB2BActivity extends BaseActivity implements RecognizerDialogLis
                             process.setTaskcode(item.getString("taskcode"));
                             process.setAttachs(item.getString("attachs"));
                             process.setEndTime(item.getString("enddate"));
+                            if ("待确认".equals(process.getStatus()) && process.getRecorderid().equals(emCode)) {
+                                waitList.add(process);
+                                isref = true;
+                            }
+
                             isendList.add(process);
 
                             if (i == data.size() - 1) {
@@ -192,6 +204,10 @@ public class TaskB2BActivity extends BaseActivity implements RecognizerDialogLis
                                 doShowListData();
                             }
                         }
+                        if (isref && tab_type == 1) {
+                            sort();
+                            adapter.notifyDataSetChanged();
+                        }
                     } else {
                         doShowListData();
                     }
@@ -245,7 +261,7 @@ public class TaskB2BActivity extends BaseActivity implements RecognizerDialogLis
         }
         listview_main.onRefreshComplete();
         LogUtil.prinlnLongMsg("login_Name,allList", login_Name + JSON.toJSONString(allList));
-        String emcode = CommonUtil.getEmcode();
+        String emcode = getEmcode();
         if (ListUtils.isEmpty(allList)) return;
         for (int i = 0; i < allList.size(); i++) {
             // 待处理
@@ -268,16 +284,29 @@ public class TaskB2BActivity extends BaseActivity implements RecognizerDialogLis
             if (emcode.equals(allList.get(i).getRecorderid()) && !"待确认".equals(allList.get(i).getStatus())) {
                 isendList.add(allList.get(i));
             }
-
             if (i == allList.size() - 1) {
                 LogUtil.prinlnLongMsg("waitList", JSON.toJSONString(waitList));
                 LogUtil.prinlnLongMsg("doneList", JSON.toJSONString(doneList));
                 LogUtil.prinlnLongMsg("isendList", JSON.toJSONString(isendList));
-
                 sendServiceForISend(mCurrentPage);  //  进来请求我发起的任务数据
             }
         }
+        sort();
+    }
 
+    private void sort() {
+        Comparator comparator = new Comparator<AllProcess>() {
+            @Override
+            public int compare(AllProcess lhs, AllProcess rhs) {
+                return (int) (rhs.getDatetime().getTime() - lhs.getDatetime().getTime());
+            }
+        };
+        if (!ListUtils.isEmpty(isendList))
+            Collections.sort(isendList, comparator);
+        if (!ListUtils.isEmpty(waitList))
+            Collections.sort(waitList, comparator);
+        if (!ListUtils.isEmpty(doneList))
+            Collections.sort(doneList, comparator);
     }
 
     @Override
@@ -299,7 +328,6 @@ public class TaskB2BActivity extends BaseActivity implements RecognizerDialogLis
         mEmptyLayout.setShowLoadingButton(false);
         mEmptyLayout.showEmpty();
 //        mEmptyLayout.showLoading();
-
 //        sendResquestForServer("进行中", 2,mCurrentPage);
         initHeaderView();//  头布局显示
         initData();

WeiChat/src/main/java/com/xzjmyk/pm/activity/view/OACalendarView.java

@@ -34,6 +34,7 @@ public class OACalendarView extends View implements View.OnTouchListener {
     //装饰物 decorat
     private String decoratDays;
     private int maxDay;//当月有多少天
+    private int[] workWeeks={2,3,4,5,6};
 
 
     private Calendar calendar;
@@ -205,9 +206,7 @@ public class OACalendarView extends View implements View.OnTouchListener {
         //使文字垂直居中
         Paint.FontMetrics fontMetrics = surface.hineDatePaint.getFontMetrics();
         float fontHeight = fontMetrics.bottom - fontMetrics.top;
-//        float dayTextY = surface.weekHeight +(surface.cellHeight +surface.dateTaxtSize) / 2;
         float dayTextY = surface.weekHeight + (surface.cellHeight + fontHeight) / 2 - fontMetrics.bottom;
-
         for (int i = 0; i < startIndex; i++) {
             float dayTextX = i * surface.cellWidth + (surface.cellWidth - surface.hineDatePaint.measureText("今")) / 2f;
             canvas.drawText(calendar.get(Calendar.DAY_OF_MONTH) + "", dayTextX, dayTextY, surface.hineDatePaint);

WeiChat/src/main/res/drawable/oa_rbbg.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/rb_clicked" android:state_checked="true" />
+    <item android:drawable="@drawable/rb_clicked" android:state_selected="true"></item>
+    <item android:drawable="@drawable/rb_clicked" android:state_pressed="true"></item>
+    <item android:drawable="@drawable/rb_notclicked" android:state_checked="false" />
+</selector>

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

@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <android.support.v4.view.ViewPager
+        android:id="@+id/ad_vp"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <RadioGroup
+            android:id="@+id/rg"
+            android:layout_width="200dp"
+            android:layout_height="wrap_content"
+            android:layout_alignParentBottom="true"
+            android:layout_centerHorizontal="true"
+            android:layout_marginBottom="6dp"
+            android:orientation="horizontal">
+
+            <RadioButton
+                android:id="@+id/rb1"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:button="@drawable/oa_rbbg"
+                android:checked="true" />
+
+            <RadioButton
+                android:id="@+id/rb2"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:button="@drawable/oa_rbbg" />
+
+            <RadioButton
+                android:id="@+id/rb3"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:button="@drawable/oa_rbbg" />
+
+            <RadioButton
+                android:id="@+id/rb4"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:button="@drawable/oa_rbbg" />
+        </RadioGroup>
+
+        <ImageView
+            android:id="@+id/btn"
+            android:layout_width="200dp"
+            android:layout_height="300dp"
+            android:layout_alignParentBottom="true"
+            android:layout_centerHorizontal="true"
+            android:layout_marginBottom="40dp"
+            android:padding="10dp"
+            android:src="@drawable/to_login"
+            android:visibility="gone" />
+    </RelativeLayout>
+</FrameLayout>

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

@@ -32,9 +32,10 @@
               android:orientation="horizontal">
               <TextView
                   android:layout_width="wrap_content"
-                  android:layout_height="wrap_content" 
+                  android:layout_height="match_parent"
+                  android:gravity="center"
                   android:paddingLeft="10dp"
-                  android:text="账户 |"/>
+                  android:text="账号    |"/>
               <!--   android:drawableLeft="@drawable/login_user_name"-->
               <com.xzjmyk.pm.activity.view.ClearEditText
                   android:id="@+id/phone_numer_edit"
@@ -58,9 +59,10 @@
             android:orientation="horizontal">
             <TextView
                 android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                android:layout_height="match_parent"
+                android:gravity="center"
                 android:paddingLeft="10dp"
-                android:text="密码 |"/>
+                android:text="密码    |"/>
             <!--    android:drawableLeft="@drawable/loginpw"-->
             <com.xzjmyk.pm.activity.view.ClearEditText
                 android:id="@+id/password_edit"

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

@@ -1,5 +1,7 @@
 <?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 -->
+<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,31 +35,64 @@
                     android:layout_height="wrap_content"
                     android:orientation="horizontal"
                     android:paddingBottom="10dp">
-
+                    <RelativeLayout
+                        android:layout_weight="1"
+                        android:layout_width="0dp"
+                        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="0dp"
+                        android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_weight="1"
                         android:drawablePadding="@dimen/drawable_padding"
                         android:drawableTop="@drawable/oa_1"
-                        android:gravity="center"
+                        android:layout_centerInParent="true"
                         android:text="打卡签到"
                         android:textColor="@color/white"
                         android:layout_marginTop="2dp"/>
-
+                    </RelativeLayout>
+                    <RelativeLayout
+                        android:layout_weight="1"
+                        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="0dp"
+                        android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginTop="2dp"
-                        android:layout_weight="1"
+                        android:gravity="center"
                         android:drawablePadding="@dimen/drawable_padding"
                         android:drawableTop="@drawable/oa_2"
-                        android:gravity="center"
+                        android:layout_centerInParent="true"
                         android:text="外勤签到"
                         android:textColor="@color/white" />
-
+                        </RelativeLayout>
                     <TextView
                         android:id="@+id/worklog"
                         android:layout_width="0dp"
@@ -469,4 +504,5 @@
     </LinearLayout>
 
 
-</com.handmark.pulltorefresh.library.PullToRefreshScrollView>
+</com.handmark.pulltorefresh.library.PullToRefreshScrollView>
+<!---->

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

@@ -9,8 +9,8 @@
     <ScrollView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:paddingRight="10dp"
-        android:paddingLeft="5dp">
+        android:paddingLeft="5dp"
+        android:paddingRight="10dp">
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -21,8 +21,8 @@
             <!--公司-->
             <RelativeLayout
                 android:id="@+id/rl_uas_website"
-                android:visibility="gone"
-                style="@style/IMTbleLine">
+                style="@style/IMTbleLine"
+                android:visibility="gone">
 
                 <TextView
                     android:id="@+id/uas_website_text"
@@ -52,6 +52,7 @@
                     android:background="@drawable/oa_next"
                     android:contentDescription="@string/app_name" />
             </RelativeLayout>
+
             <RelativeLayout
                 android:id="@+id/speech_recognition_rl"
                 style="@style/IMTbleLine"
@@ -76,6 +77,7 @@
                     android:background="@drawable/oa_next"
                     android:contentDescription="@string/app_name" />
             </RelativeLayout>
+
             <RelativeLayout
                 android:id="@+id/new_step_rl"
                 style="@style/IMTbleLine"
@@ -100,10 +102,12 @@
                     android:background="@drawable/oa_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/uu_step_rl"
                 style="@style/IMTbleLine1"
@@ -118,26 +122,25 @@
                     android:gravity="center"
                     android:text=" UU 运动"
                     android:textColor="@color/black"
-                    android:textSize="14sp"
-                   />
+                    android:textSize="14sp" />
 
                 <ImageView
                     android:id="@+id/uu_step_im"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:src="@drawable/uu_step"
-                    android:layout_toRightOf="@+id/uu_step_text"
                     android:layout_centerVertical="true"
-                    android:visibility="gone"
-                    />
+                    android:layout_toRightOf="@+id/uu_step_text"
+                    android:src="@drawable/uu_step"
+                    android:visibility="gone" />
+
                 <com.xzjmyk.pm.activity.ui.erp.view.SwitchView
                     android:id="@+id/uu_step_reply"
                     android:layout_width="40dp"
                     android:layout_height="25dp"
                     android:layout_alignParentRight="true"
-                    android:layout_centerVertical="true"
-                    />
+                    android:layout_centerVertical="true" />
             </RelativeLayout>
+
             <View
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/line"
@@ -163,8 +166,7 @@
                     android:layout_width="40dp"
                     android:layout_height="25dp"
                     android:layout_alignParentRight="true"
-                    android:layout_centerVertical="true"
-                     />
+                    android:layout_centerVertical="true" />
             </RelativeLayout>
             <!--清除缓存-->
             <View
@@ -237,7 +239,7 @@
             <View
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/line"
-               
+
                 android:background="@color/item_line" />
 
             <RelativeLayout
@@ -294,13 +296,12 @@
                     android:contentDescription="@string/app_name" />
             </RelativeLayout>
 
-       
 
             <RelativeLayout
                 android:id="@+id/rl_app_update"
                 style="@style/IMTbleLine"
-                android:clickable="true"
-                android:background="@drawable/selector_me_menu_item_bg">
+                android:background="@drawable/selector_me_menu_item_bg"
+                android:clickable="true">
 
                 <TextView
                     android:id="@+id/version_text"
@@ -329,10 +330,12 @@
                     android:background="@drawable/oa_next"
                     android:contentDescription="@string/app_name" />
             </RelativeLayout>
+
             <View
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/line"
                 android:background="@color/item_line" />
+
             <Button
                 android:id="@+id/exit_btn"
                 android:layout_width="match_parent"
@@ -342,9 +345,9 @@
                 android:layout_marginTop="30dp"
                 android:background="@drawable/bg_bule_btn"
                 android:padding="10dp"
-                android:textSize="@dimen/text_main"
                 android:text="@string/exit_current_account"
-                android:textColor="@color/white" />
+                android:textColor="@color/white"
+                android:textSize="@dimen/text_main" />
         </LinearLayout>
     </ScrollView>
 

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

@@ -10,8 +10,9 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:contentDescription="@string/app_name"
+        android:background="@drawable/index"
         android:scaleType="centerCrop"
-        android:src="@drawable/index" />
+        />
 
     <RelativeLayout
         android:id="@+id/select_lv"

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

@@ -79,7 +79,35 @@
             android:id="@+id/rl_uas_sys"
             style="@style/IMTbleLine"
             android:background="@drawable/selector_me_menu_item_bg">
-
+            <TextView
+                android:id="@+id/tv_oa_desc"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="自动考勤"
+                android:layout_below="@+id/tv_menu_oa"
+                android:layout_toLeftOf="@+id/iv_desc_oa"
+                android:layout_toStartOf="@+id/iv_desc_oa" />
+            <ImageView
+                android:layout_width="20dp"
+                android:layout_height="20dp"
+                android:src="@drawable/kaoqintongji"
+                android:layout_alignBottom="@+id/oa_next"
+                android:layout_toLeftOf="@+id/tv_menu_oa"
+                android:layout_toStartOf="@+id/tv_menu_oa"
+                android:id="@+id/iv_desc_oa" />
+            <TextView
+                android:id="@+id/tv_menu_oa"
+                android:layout_width="10dp"
+                android:layout_height="10dp"
+                android:layout_gravity="top|right"
+                android:background="@drawable/hongdian"
+                android:gravity="center"
+                android:text=""
+                android:textColor="@android:color/white"
+                android:textSize="10.0dip"
+                android:layout_toLeftOf="@+id/oa_next"
+                android:layout_toStartOf="@+id/oa_next"
+                android:layout_alignTop="@+id/tv_oa" />
             <TextView
                 android:id="@+id/tv_oa"
                 android:layout_width="wrap_content"
@@ -159,7 +187,36 @@
             android:id="@+id/setting_rl"
             style="@style/IMTbleLine"
             android:background="@drawable/selector_me_menu_item_bg">
+            <TextView
+                android:id="@+id/tv_desc_business"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="查看订单询价单"
+                android:layout_below="@+id/tv_business_num"
+                android:layout_toLeftOf="@+id/iv_business_desc"
+                android:layout_toStartOf="@+id/iv_business_desc" />
+            <ImageView
+                android:id="@+id/iv_business_desc"
+                android:layout_width="20dp"
+                android:layout_height="20dp"
+                android:src="@drawable/kaoqintongji"
+                android:layout_below="@+id/tv_business_num"
+                android:layout_toLeftOf="@+id/tv_business_num"
+                android:layout_toStartOf="@+id/tv_business_num"
+                />
+            <TextView
+                android:id="@+id/tv_business_num"
+                android:layout_width="10dp"
+                android:layout_height="10dp"
+                android:layout_gravity="top|right"
+                android:background="@drawable/hongdian"
+                android:gravity="center"
+                android:text=""
+                android:textColor="@android:color/white"
 
+                android:layout_toLeftOf="@+id/imageView2"
+                android:layout_toStartOf="@+id/imageView2"
+                android:layout_alignTop="@+id/textView2" />
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -169,7 +226,8 @@
                 android:gravity="center"
                 android:text="商务管理"
                 android:textColor="@color/text_main"
-                android:textSize="14sp" />
+                android:textSize="14sp"
+                android:id="@+id/textView2" />
 
             <ImageView
                 android:layout_width="@dimen/next_width"
@@ -178,7 +236,8 @@
                 android:layout_centerVertical="true"
 
                 android:background="@drawable/oa_next"
-                android:contentDescription="@string/app_name" />
+                android:contentDescription="@string/app_name"
+                android:id="@+id/imageView2" />
         </RelativeLayout>
 
         <View

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

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <ImageView
+        android:id="@+id/ad_image"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+</LinearLayout>

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

@@ -129,7 +129,8 @@
                 android:text="999"
                 android:textColor="@android:color/white"
                 android:textSize="10.0dip"
-                android:visibility="gone" />
+                android:visibility="gone"
+                />
         </FrameLayout>
 
         <RelativeLayout
@@ -236,13 +237,33 @@
                 android:text="我的订阅"
                 android:textColor="@color/text_main"
                 android:textSize="16sp" />
-
+            <TextView
+                android:id="@+id/tv_dingyue_desc"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="查看企业数据"
+                android:layout_below="@+id/subscribe_time_tv"
+                android:layout_toLeftOf="@+id/tv_dingYue_num"
+                android:layout_toStartOf="@+id/tv_dingYue_num" />
+            <TextView
+                android:id="@+id/tv_dingYue_num"
+                android:layout_width="10dp"
+                android:layout_height="10dp"
+                android:layout_gravity="top|right"
+                android:layout_alignParentRight="true"
+                android:background="@drawable/hongdian"
+                android:gravity="center"
+                android:text=""
+                android:textColor="@android:color/white"
+                android:textSize="10.0dip"
+                />
             <TextView
                 android:id="@+id/subscribe_time_tv"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_alignParentRight="true"
                 android:ellipsize="end"
+                android:visibility="gone"
                 android:textColor="@color/text_hine"
                 android:textSize="14sp" />