Browse Source

新的加班申请单据反提交删除操作完成。2

FANGLH 9 years ago
parent
commit
5b39ca1394

+ 2 - 6
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/MainActivity.java

@@ -19,7 +19,6 @@ import android.os.PersistableBundle;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentManager;
 import android.support.v4.app.FragmentTransaction;
-import android.text.TextUtils;
 import android.util.DisplayMetrics;
 import android.util.Log;
 import android.view.Gravity;
@@ -36,10 +35,7 @@ import com.android.volley.Response;
 import com.android.volley.VolleyError;
 import com.baidu.android.pushservice.PushConstants;
 import com.baidu.android.pushservice.PushManager;
-import com.baidu.autoupdatesdk.AppUpdateInfo;
-import com.baidu.autoupdatesdk.AppUpdateInfoForInstall;
 import com.baidu.autoupdatesdk.BDAutoUpdateSDK;
-import com.baidu.autoupdatesdk.CPCheckUpdateCallback;
 import com.baidu.autoupdatesdk.UICheckUpdateCallback;
 import com.xzjmyk.pm.activity.AppConfig;
 import com.xzjmyk.pm.activity.MyApplication;
@@ -655,7 +651,7 @@ public class MainActivity extends BaseActivity implements NetWorkObservable.NetW
         BDAutoUpdateSDK.uiUpdateAction(this, new UICheckUpdateCallback() {
             @Override
             public void onCheckComplete() {
-                //发现新版本就初始化这个值保证下次“为UU评分”弹出,直至升级,对:就是这么流氓,叫你不升级我弹死你
+               /* //发现新版本就初始化这个值保证下次“为UU评分”弹出,直至升级,对:就是这么流氓,叫你不升级我弹死你
                 BDAutoUpdateSDK.cpUpdateCheck(MainActivity.this,
                         new CPCheckUpdateCallback() {
 
@@ -677,7 +673,7 @@ public class MainActivity extends BaseActivity implements NetWorkObservable.NetW
                                 }
                                 progressDialog.dismiss();
                             }
-                        });
+                        });*/
             }
         });
         Log.i("NEW_VERSION_RATING", PreferenceUtils.getInt(MyApplication.getInstance(), MainActivity.NEW_VERSION_RATING) + "");

+ 8 - 8
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/CommonDocDetailsActivity.java

@@ -197,25 +197,25 @@ public class CommonDocDetailsActivity extends BaseActivity {
         //当获取到正确的单据caller和单据id时
         if (!TextUtils.isEmpty(mCaller) && mkeyValue != -1) {
             if ("Ask4Leave".equals(mCaller)) {
-                getSupportActionBar().setTitle(getString(R.string.oavacation_apply) + getString(R.string.doc_detail));
+                getSupportActionBar().setTitle(getString(R.string.oavacation_apply) + "详情");
             }
             if ("FeePlease!CCSQ".equals(mCaller)) {
-                getSupportActionBar().setTitle(getString(R.string.oatravel_apply)+ getString(R.string.doc_detail));
+                getSupportActionBar().setTitle(getString(R.string.oatravel_apply)+ "详情");
             }
             if ("Workovertime".equals(mCaller) || "ExtraWork$".equals(mCaller)) {
-                getSupportActionBar().setTitle(getString(R.string.oaovertime_apply)+ getString(R.string.doc_detail));
+                getSupportActionBar().setTitle(getString(R.string.oaovertime_apply)+ "详情");
             }
             if ("SpeAttendance".equals(mCaller)) {
-                getSupportActionBar().setTitle(getString(R.string.oaspecial_attendance_apply)+ getString(R.string.doc_detail));
+                getSupportActionBar().setTitle(getString(R.string.oaspecial_attendance_apply)+ "详情");
             }if ("MaterielApply".equals(mCaller)) {
-                getSupportActionBar().setTitle(getString(R.string.oamaterials_apply)+ getString(R.string.doc_detail));
+                getSupportActionBar().setTitle(getString(R.string.oamaterials_apply)+ "详情");
             } else if ("MainTain".equals(mCaller)) {
-                getSupportActionBar().setTitle(getString(R.string.oaservice_apply)+ getString(R.string.doc_detail));
+                getSupportActionBar().setTitle(getString(R.string.oaservice_apply)+ "详情");
             }if ("StandbyApplication".equals(mCaller)) {
-                getSupportActionBar().setTitle(getString(R.string.oaStandby_machine_apply)+ getString(R.string.doc_detail));
+                getSupportActionBar().setTitle(getString(R.string.oaStandby_machine_apply)+ "详情");
             } else
             if (!StringUtils.isEmpty(intent.getStringExtra("title"))) {
-                getSupportActionBar().setTitle(intent.getStringExtra("title")+ getString(R.string.doc_detail));
+                getSupportActionBar().setTitle(intent.getStringExtra("title")+ "详情");
             }
             //请求获取单据提交内容数据
             progressDialog.show();