Kaynağa Gözat

登录给后台传sdk ,区分升级版本

李士越 10 ay önce
ebeveyn
işleme
8fb44279b8

+ 3 - 3
AndroidManifest.xml

@@ -2,12 +2,12 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.jiaju.activity"
     android:versionCode="1"
-    android:versionName="1.2.24.0717" >
+    android:versionName="1.2.25.0527" >
 
     <!-- 23  14 -->
     <uses-sdk
-        android:minSdkVersion="14"
-        android:targetSdkVersion="14" />
+        android:minSdkVersion="23"
+        android:targetSdkVersion="23" />
 
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" >
     </uses-permission>

+ 5 - 4
src/com/jiaju/activity/LoginActivity.java

@@ -142,7 +142,7 @@ public class LoginActivity extends Activity implements OnClickListener {
 	login_yonghu.setText(name);
 	login_zhangtao.setSelection(login_zhangtao.length());
 	login_yonghu.setSelection(login_yonghu.length());
-	String changeFlag = preferencesjizhu.getString("changeuser", "");
+	String changeFlag = preferencesjizhu.getString("changeuser", ""); 
 	if (changeFlag.equals("1")) {
 	    Editor edit = preferencesjizhu.edit();
 	    edit.putString("changeuser", "0");
@@ -483,7 +483,8 @@ public class LoginActivity extends Activity implements OnClickListener {
 			    if (matchresult) {
 				boolean downloadFlag = CommonUtil.CompareServerVersion(localVersion, serverApp);
 				if (downloadFlag) {
-				    if (contentlength == -1) {
+					 if (contentlength == -1) {
+//				    if (contentlength != -1) {
 					Intent intent = new Intent(LoginActivity.this, HomeActivity.class);
 					startActivity(intent);
 				    } else {
@@ -745,8 +746,8 @@ public class LoginActivity extends Activity implements OnClickListener {
 		JSONObject params = new JSONObject();
 		params.put("accountCode", accountCode);
 		params.put("userCode", login_userCode);
-		params.put("userPassword", password);
-		params.put("sessionKey", sessionkey);
+		params.put("userPassword", password); 
+		params.put("sdk", Build.VERSION.SDK_INT);
 		downloadFileStream("http://" + ServerAddress_ip + ":" + ServerAddress_duankou + Constants.serverAction
 			+ "/AutoUpgrade", installFilePath, params.toString());
 

+ 3 - 0
src/com/jiaju/activity/SetActivity.java

@@ -32,6 +32,7 @@ import android.content.res.Configuration;
 import android.content.res.Resources;
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
+import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.HandlerThread;
@@ -283,6 +284,7 @@ public class SetActivity extends Activity implements OnClickListener {
 				params.put("userCode", "");
 				params.put("userPassword", "");
 				params.put("sessionKey", "");
+				params.put("sdk", Build.VERSION.SDK_INT);
 				downloadFileStream("http://" + ServerAddress_ip + ":"
 						+ ServerAddress_duankou + Constants.serverAction
 						+ "/AutoUpgrade", installFilePath, params.toString());
@@ -724,6 +726,7 @@ public class SetActivity extends Activity implements OnClickListener {
 			ProcessDialogUtils.showProcessDialog(SetActivity.this);
 			try {
 				json = new JSONObject();
+				json.put("sdk", Build.VERSION.SDK_INT);
 				thread = new HandlerThread("AppSizeThread", 5);
 				thread.start();
 				mHandler = new Handler(thread.getLooper());

+ 1 - 2
src/com/jiaju/adapter/DeliveryNoteInquiryItemAdapter.java

@@ -73,8 +73,7 @@ public class DeliveryNoteInquiryItemAdapter extends BaseAdapter{
 			convertView.setTag(viewHolder); 
 		} else {
 			viewHolder = (ViewHolder) convertView.getTag();
-		}
-		 
+		} 
 		viewHolder.SendoutCodeTv.setText(deliverynoteInquiryitemModel.getSendoutCode());
 		viewHolder.SendOutWarehouseTv.setText(deliverynoteInquiryitemModel.getSendOutWarehouse());
 		viewHolder.ReceivingWarehouseTv.setText(deliverynoteInquiryitemModel.getReceivingWarehouse());