Browse Source

chen bug fix

FANGLH 8 years ago
parent
commit
4cc2fe55fb

+ 1 - 1
WeiChat/build.gradle

@@ -138,6 +138,6 @@ dependencies {
     debugCompile 'com.squareup.leakcanary:leakcanary-android:1.5'
     releaseCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.5'
     compile files('libs/core.jar')
+    compile 'com.android.support:design:24.2.1'
 
- 
 }

+ 14 - 11
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/ExpenseReimbursementActivity.java

@@ -1528,7 +1528,10 @@ public class ExpenseReimbursementActivity extends BaseActivity implements View.O
                 public void onTextChanged(CharSequence s, int start, int before, int count) {}
                 @Override
                 public void afterTextChanged(Editable s) {
-                    if (StringUtils.isEmpty(s.toString())) return;
+                    if (StringUtils.isEmpty(s.toString())) {
+                        sum_money_tv.setText(null);
+                        return;
+                    }
                     if (finalViewHolder.details_money.testValidity()){
                         money_editString = s.toString();
                         models.get(position).setCost_money(Double.valueOf(money_editString)); //TODO有bug
@@ -1924,12 +1927,12 @@ public class ExpenseReimbursementActivity extends BaseActivity implements View.O
                     .putExtra("title", getSupportActionBar().getTitle().toString()));
         }
         if (item.getItemId() == android.R.id.home){
-            if (formid != 0){
+//            if (formid != 0){
                finish();
-            }else{
-                startActivity(new Intent(ExpenseReimbursementActivity.this, OAActivity.class)
-                        .putExtra("WorkDailyAdd", "WorkDailyAdd"));
-            }
+//            }else{
+//                startActivity(new Intent(ExpenseReimbursementActivity.this, OAActivity.class)
+//                        .putExtra("WorkDailyAdd", "WorkDailyAdd"));
+//            }
 
         }
         return super.onOptionsItemSelected(item);
@@ -1937,12 +1940,12 @@ public class ExpenseReimbursementActivity extends BaseActivity implements View.O
 
     @Override
     public void onBackPressed() {
-        if (formid != 0){
+//        if (formid != 0){
             finish();
-        }else {
-            startActivity(new Intent(ExpenseReimbursementActivity.this, OAActivity.class)
-                    .putExtra("WorkDailyAdd", "WorkDailyAdd"));
-        }
+//        }else {
+//            startActivity(new Intent(ExpenseReimbursementActivity.this, OAActivity.class)
+//                    .putExtra("WorkDailyAdd", "WorkDailyAdd"));
+//        }
         super.onBackPressed();
     }
 

+ 1 - 1
materialdialogs/build.gradle

@@ -21,5 +21,5 @@ android {
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
     compile 'com.android.support:appcompat-v7:24.2.1'
-
+    compile 'com.android.support:design:24.2.1'
 }