AndroidNative2026/Haleon_All_Country
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #55 from CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/ysy_final

Browse Source 
T2P upload data newss
This commit is contained in:
YadavendraSinghYaduvanshi
2017-01-13 19:26:29 +05:30
committed by GitHub
parent c15aae0685 b0968e9ca6
commit 7d54e6c91b
2 changed files with 549 additions and 551 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java
+4 -4
View File
@@ -213,18 +213,18 @@ public class MainActivity extends AppCompatActivity
startActivity(i); startActivity(i);
} else { } else {
//if (isStoreCheckedIn()&& isValid()) { if (isStoreCheckedIn()&& isValid()) {
Intent i = new Intent(getBaseContext(), UploadActivity.class); Intent i = new Intent(getBaseContext(), UploadActivity.class);
startActivity(i); startActivity(i);
//finish(); //finish();
/*} else { } else {
Snackbar.make(webView, error_msg, Snackbar.LENGTH_SHORT) Snackbar.make(webView, error_msg, Snackbar.LENGTH_SHORT)
.setAction("Action", null).show(); .setAction("Action", null).show();
}*/ }
} }
@@ -278,7 +278,7 @@ public class MainActivity extends AppCompatActivity
/*Intent startDownload = new Intent(this,T2PComplianceActivity.class); /*Intent startDownload = new Intent(this,T2PComplianceActivity.class);
startActivity(startDownload); startActivity(startDownload);
*/ */
overridePendingTransition(R.anim.activity_in, R.anim.activity_out); //overridePendingTransition(R.anim.activity_in, R.anim.activity_out);
} else if (id == R.id.nav_setting) { } else if (id == R.id.nav_setting) {
GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java
+545 -547
View File
File diff suppressed because it is too large Load Diff