ME-Info-LongClick-InfoCode

WeiChat/src/main/AndroidManifest.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.xzjmyk.pm.activity"
-    android:versionCode="90"
-    android:versionName="5.7.6" >
+    android:versionCode="91"
+    android:versionName="5.7.7" >
 
     <uses-sdk
         android:minSdkVersion="11"

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

@@ -2,6 +2,7 @@ package com.xzjmyk.pm.activity;
 
 import android.app.Application;
 import android.content.Context;
+import android.content.pm.PackageManager;
 import android.graphics.Bitmap;
 import android.graphics.Bitmap.Config;
 import android.os.Build;
@@ -136,6 +137,11 @@ public class MyApplication extends Application {
         // 初始化网络监听
         mNetWorkObservable = new NetWorkObservable(this);
         initErpDB();
+        try {
+            com.xzjmyk.pm.activity.ui.erp.util.Constants.cleanRed(this);
+        } catch (PackageManager.NameNotFoundException e) {
+            e.printStackTrace();
+        }
 
     }
 

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

@@ -264,7 +264,9 @@ public class DataDownloadActivity extends BaseActivity {
         intent.setFlags(IntentCompat.FLAG_ACTIVITY_CLEAR_TASK);
         intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
         startActivity(intent);
+     
         finish();
+        overridePendingTransition(R.anim.anim_activity_in, R.anim.anim_activity_out);
     }
 
     /**

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

@@ -208,7 +208,7 @@ public class OAActivity extends BaseActivity implements View.OnClickListener, Wo
 
     @Override
     protected void onResume() {
-        int new_function_notice = PreferenceUtils.getInt(MyApplication.getInstance(), MainActivity.NEW_FUNCTION_NOTICE);
+        int new_function_notice = PreferenceUtils.getInt(MyApplication.getInstance(), Constants.NEW_FUNCTION_NOTICE);
         if (new_function_notice == 1) {
             oamain_sign_statistical_notice_tv.setVisibility(View.INVISIBLE);
         } else {
@@ -430,7 +430,7 @@ public class OAActivity extends BaseActivity implements View.OnClickListener, Wo
         //判断是否是管理员
         CommonInterface.getInstance().judgeManager(null);
         CommonInterface.getInstance().getOutSetInfo(null);
-        int new_function_notice = PreferenceUtils.getInt(MyApplication.getInstance(), MainActivity.NEW_FUNCTION_NOTICE);
+        int new_function_notice = PreferenceUtils.getInt(MyApplication.getInstance(), Constants.NEW_FUNCTION_NOTICE);
         if (new_function_notice == 1) {
             oamain_sign_statistical_notice_tv.setVisibility(View.INVISIBLE);
         } else {
@@ -963,6 +963,7 @@ public class OAActivity extends BaseActivity implements View.OnClickListener, Wo
                 break;
             case R.id.oamain_sign_statistical_tv: //考勤统计
                 startActivity(new Intent(activity, StatisticsActivity.class));
+                PreferenceUtils.putInt(Constants.NEW_FUNCTION_NOTICE, 1);
                 break;
         }
     }

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

@@ -1,9 +1,14 @@
 package com.xzjmyk.pm.activity.ui.erp.util;
 
 import android.content.Context;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
 
+import com.xzjmyk.pm.activity.ui.MainActivity;
+import com.xzjmyk.pm.activity.util.PreferenceUtils;
+
 /**
  * Created by Administrator on 2016/1/30.
  */
@@ -303,12 +308,33 @@ public class Constants {
     public final static String new_signout = "signout";
     public final static String new_oa = "oa_menu";
     public final static String new_business = "business";
-    
     public final static String NEW_SETING = "seting_2";
- 
     public final static String NEW_UURUN = "NEW_UURUN";
     public final static String NEW_ME_TAG = "ME_TAG";
-
     public final static String SET_SIGN_AUTO="set_sign_auto";
     public final static String SET_SIGN_IN="set_sign_in";
+    public final static String SET_SIGN_LANGUAGE="set_sign_language";
+    
+
+    public final static String NEW_FUNCTION_NOTICE = "NEWFUNCTIONNOTICE";
+
+
+    public static void cleanRed(Context ct) throws PackageManager.NameNotFoundException {
+        int versionCode = PreferenceUtils.getInt("versionCode", 0);
+        LogUtil.i("versionCode=" + versionCode);
+        int appVersionCode = getVersionCode(ct);
+        if (appVersionCode > versionCode) {
+            LogUtil.i("getVersionCode(ct)>versionCode");
+            PreferenceUtils.putInt("versionCode", appVersionCode);
+            CommonUtil.putSharedPreferencesBoolean(ct, new_oa, false);
+            PreferenceUtils.putInt(MainActivity.NEW_FUNCTION_NOTICE, 0);
+        }
+    }
+
+    private static int getVersionCode(Context ct) throws PackageManager.NameNotFoundException {
+        PackageManager packageManager = ct.getPackageManager();
+        PackageInfo packageInfo = packageManager.getPackageInfo(ct.getPackageName(), 0);
+        LogUtil.i("packageInfo.versionCode=" + packageInfo.versionCode);
+        return packageInfo.versionCode;
+    }
 }

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

@@ -0,0 +1,9 @@
+package com.xzjmyk.pm.activity.ui.me;
+
+/**
+ * Created by FANGlh on 2017/6/5.
+ * function:
+ */
+
+public class InfoCodeActivity {
+}

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

@@ -75,6 +75,8 @@ public class SettingActivity extends ActionBackActivity implements View.OnClickL
     private TextView mCacheTv;
     @ViewInject(R.id.uas_website_tv)
     private TextView uas_website_tv;
+    
+    
     @ViewInject(R.id.tv_menu_setting)
     private TextView tv_menu_setting;
 
@@ -93,6 +95,8 @@ public class SettingActivity extends ActionBackActivity implements View.OnClickL
     private TextView tv_signauto_new;
     @ViewInject(R.id.tv_sign_new)
     private TextView tv_sign_new;
+    @ViewInject(R.id.tv_language_new)
+    private TextView  tv_language_new;
  
     @ViewInject(R.id.language_us_rl)
     private RelativeLayout  language_us_rl;
@@ -117,7 +121,6 @@ public class SettingActivity extends ActionBackActivity implements View.OnClickL
     private String newStep_service_name = "com.xzjmyk.pm.newpedo.service.StepService";
 
     private PopupWindow setWindow = null;//
-    private Boolean platform;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -131,7 +134,6 @@ public class SettingActivity extends ActionBackActivity implements View.OnClickL
 
 
     private void initView() {
-        platform = ApiUtils.getApiModel() instanceof ApiPlatform;// 判断当前为平台用户
         new_step_rl.setOnClickListener(this);
 //        new_step_rl.setVisibility(View.GONE);
 
@@ -234,15 +236,16 @@ public class SettingActivity extends ActionBackActivity implements View.OnClickL
         
        tv_menu_setting.setVisibility(CommonUtil.getSharedPreferencesBoolean(this, Constants.NEW_UURUN, false) ? View.GONE : View.VISIBLE);
        tv_signauto_new.setVisibility(CommonUtil.getSharedPreferencesBoolean(this, Constants.SET_SIGN_AUTO, false) ? View.GONE : View.VISIBLE);
-       tv_sign_new.setVisibility(CommonUtil.getSharedPreferencesBoolean(this, Constants.SET_SIGN_IN, false) ? View.GONE : View.VISIBLE); 
+       tv_sign_new.setVisibility(CommonUtil.getSharedPreferencesBoolean(this, Constants.SET_SIGN_IN, false) ? View.GONE : View.VISIBLE);
+        tv_language_new.setVisibility(CommonUtil.getSharedPreferencesBoolean(this, Constants.SET_SIGN_LANGUAGE, false) ? View.GONE : View.VISIBLE);
+        
         
         speech_recognition_rl.setOnClickListener(this);
         sign_in_rl.setOnClickListener(this);
         sign_out_rl.setOnClickListener(this);
         language_us_rl.setOnClickListener(this);
         
-//        if (CommonUtil.isReleaseVersion()){
-        if (platform){
+        if (ApiUtils.getApiModel() instanceof ApiPlatform){
             language_us_rl.setVisibility(View.GONE);
         }else{
             language_us_rl.setVisibility(View.VISIBLE);
@@ -310,6 +313,8 @@ public class SettingActivity extends ActionBackActivity implements View.OnClickL
         switch (v.getId()) {
             case R.id.language_us_rl:
                 startActivity(new Intent(this, SelectLanguageActivity.class));
+                CommonUtil.setSharedPreferences(this, Constants.SET_SIGN_LANGUAGE, true);
+                tv_language_new.setVisibility(View.GONE);
                 break;
             case R.id.sign_in_rl:
                 showPopupWindow();

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

@@ -1,7 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--com.handmark.pulltorefresh.library.PullToRefreshScrollView -->
-<com.handmark.pulltorefresh.library.PullToRefreshScrollView
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<?xml version="1.0" encoding="utf-8"?><!--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"
@@ -35,64 +33,70 @@
                     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">
+                        android:layout_height="match_parent"
+                        android:layout_weight="1">
+
                         <TextView
                             android:id="@+id/tv_signin_num"
                             android:layout_width="10dp"
                             android:layout_height="10dp"
+                            android:layout_alignParentEnd="true"
+                            android:layout_alignParentRight="true"
+                            android:layout_alignTop="@+id/signin"
+                            android:layout_gravity="top|right"
                             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="@string/oasign_title"
-                        android:textColor="@color/white"
-                        android:layout_marginTop="2dp"/>
+                            android:textSize="10.0dip" />
+
+                        <TextView
+                            android:id="@+id/signin"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_centerInParent="true"
+                            android:layout_marginTop="2dp"
+                            android:drawablePadding="@dimen/drawable_padding"
+                            android:drawableTop="@drawable/oa_1"
+                            android:text="@string/oasign_title"
+                            android:textColor="@color/white" />
                     </RelativeLayout>
+
                     <RelativeLayout
-                        android:layout_weight="1"
                         android:layout_width="0dp"
-                        android:layout_height="match_parent">
+                        android:layout_height="match_parent"
+                        android:layout_weight="1">
+
                         <TextView
                             android:id="@+id/tv_signout_num"
                             android:layout_width="10dp"
                             android:layout_height="10dp"
+                            android:layout_alignParentRight="true"
+                            android:layout_gravity="top|right"
                             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="@string/oaoutplan_title"
-                        android:textColor="@color/white" />
-                        </RelativeLayout>
+                            android:textSize="10.0dip" />
+
+                        <TextView
+                            android:id="@+id/outoffice"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_centerInParent="true"
+                            android:layout_marginTop="2dp"
+                            android:drawablePadding="@dimen/drawable_padding"
+                            android:drawableTop="@drawable/oa_2"
+                            android:gravity="center"
+                            android:text="@string/oaoutplan_title"
+                            android:textColor="@color/white" />
+                    </RelativeLayout>
+
                     <TextView
                         android:id="@+id/worklog"
                         android:layout_width="0dp"
@@ -345,9 +349,9 @@
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
                         android:gravity="center|left"
+                        android:paddingLeft="12dp"
                         android:text="@string/done"
-                        android:textSize="@dimen/text_hine"
-                        android:paddingLeft="12dp"/>
+                        android:textSize="@dimen/text_hine" />
 
                     <View
                         android:layout_width="1px"
@@ -357,10 +361,10 @@
                     <TextView
                         android:id="@+id/uok_task_num"
                         android:layout_width="0dp"
-                        android:paddingLeft="12dp"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
                         android:gravity="center|left"
+                        android:paddingLeft="12dp"
                         android:text="@string/undone"
                         android:textSize="@dimen/text_hine" />
 
@@ -399,15 +403,16 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:orientation="vertical"
-                android:visibility="gone">
+                android:visibility="gone"
+               >
 
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:background="#6A6A6A"
                     android:orientation="horizontal"
-                    android:paddingBottom="10dp"
-                    >
+                    android:paddingBottom="10dp">
+
                     <TextView
                         android:id="@+id/oamain_special_attendance_tv"
                         android:layout_width="0dp"
@@ -425,18 +430,17 @@
                         android:id="@+id/oamain_sign_statistical_tv"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
+                        android:layout_marginTop="2dp"
                         android:layout_weight="1"
                         android:orientation="vertical"
-                        android:layout_marginTop="2dp"
                         android:paddingLeft="5dp"
-                        android:visibility="visible"
-                        >
+                        android:visibility="visible">
+
                         <FrameLayout
                             android:id="@+id/notice_head_area"
-                            android:layout_width="wrap_content"
+                            android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            android:layout_marginLeft="20dp"
-                            >
+                            android:layout_marginLeft="20dp">
 
                             <ImageView
                                 android:id="@+id/notice_avatar_img"
@@ -452,24 +456,23 @@
                                 android:layout_width="10dp"
                                 android:layout_height="10dp"
                                 android:layout_gravity="top|right"
+                                android:layout_marginRight="15dp"
                                 android:background="@drawable/hongdian"
                                 android:textColor="@android:color/white"
                                 android:textSize="10.0dip"
-                                android:visibility="gone"
-                                android:layout_marginLeft="30dp"
-                                />
+                               />
                         </FrameLayout>
 
                         <TextView
-                            android:layout_height="wrap_content"
                             android:layout_width="wrap_content"
-                            android:gravity="center"
-                            android:text="@string/work_statistics"
-                            android:textColor="@color/white"
+                            android:layout_height="wrap_content"
                             android:layout_marginLeft="13dp"
                             android:layout_marginTop="5dp"
-                            />
+                            android:gravity="center"
+                            android:text="@string/work_statistics"
+                            android:textColor="@color/white" />
                     </LinearLayout>
+
                     <TextView
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
@@ -504,5 +507,4 @@
     </LinearLayout>
 
 
-</com.handmark.pulltorefresh.library.PullToRefreshScrollView>
-<!---->
+</com.handmark.pulltorefresh.library.PullToRefreshScrollView><!---->

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

@@ -338,6 +338,17 @@
                     android:text="@string/set_language"
                     android:textColor="@color/black"
                     android:textSize="14sp" />
+                <TextView
+                    android:id="@+id/tv_language_new"
+                    android:layout_width="10dp"
+                    android:layout_height="10dp"
+                    android:layout_alignTop="@+id/tv_oa"
+                    android:layout_centerVertical="true"
+                    android:layout_marginRight="10dp"
+                    android:layout_alignParentRight="true"
+                    android:background="@drawable/hongdian"
+                    android:textColor="@android:color/white"
+                    android:textSize="10.0dip" />
 
                 <ImageView
                     android:layout_width="@dimen/next_width"

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

@@ -83,7 +83,7 @@
                 android:id="@+id/tv_oa_desc"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="@string/work_oa_sigin"
+                android:text="@string/work_statistics"
                 android:layout_below="@+id/tv_menu_oa"
                 android:layout_toLeftOf="@+id/iv_desc_oa"
                 android:layout_toStartOf="@+id/iv_desc_oa" />

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

@@ -0,0 +1,6 @@
+<?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">
+
+</LinearLayout>