RA Image Android

修复bug

RA Image/app/app.iml

@@ -89,6 +89,7 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-support" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/reload-dex" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/restart-dex" />

RA Image/app/src/main/java/com/usai/redant/raimage/FullScreenLoginActivity.java

@@ -181,65 +181,7 @@ public class FullScreenLoginActivity extends Activity {
                     case Network.RESULT_NET_ERROR:
                     case Network.RESULT_NET_NOTAVAILABLE:
                     {
-                       /* SQLiteDatabase db = dbUtil.OpenDB(LoginActivity.this,
-                                null, true);
 
-                        String encryptUser = "";
-                        try
-                        {
-                            encryptUser = Crypto.encrypt("apexu", m_sName);
-                        }
-                        catch (Exception e1)
-                        {
-                            // TODO Auto-generated catch block
-                            e1.printStackTrace();
-                        }
-                        Cursor cursor = db.query("users", new String[] {
-                                        "pass", "_id" }, "name= '" + encryptUser + "'",
-                                null, null, null, "_id desc", null);
-                        if (cursor.moveToNext())
-                        {
-                            String pass = "";
-                            try
-                            {
-                                pass = Crypto.decrypt("apexp",
-                                        cursor.getString(0));
-                            }
-                            catch (Exception e)
-                            {
-                                // TODO Auto-generated catch block
-                                e.printStackTrace();
-                            }
-                            if (pass.equals(m_sPassword))
-                            {
-                                dbUtil.CloseCursor(cursor);
-                                dbUtil.CloseDB(db);
-                                RedAntApplication.user = m_sName;
-                                RedAntApplication.password = m_sPassword;
-                                Intent intent = new Intent();
-                                intent.setClass(LoginActivity.this,
-                                        MainActivity.class);
-                                dbgUtil.fileLog("user "+m_sName+" offline access @server "+RedAntApplication.active_address);
-                                startActivity(intent);
-                                finish();
-                            }
-                            else
-                            {
-                                // wrong password
-                                Toast toast = Toast.makeText(
-                                        getApplicationContext(),
-                                        getText(R.string.msg_user_wrong),
-                                        Toast.LENGTH_LONG);
-                                toast.setGravity(Gravity.CENTER, 0, 0);
-                                toast.show();
-                                m_etPassword
-                                        .setError(getString(R.string.error_incorrect_password));
-                                m_etPassword.requestFocus();
-                                dbUtil.CloseCursor(cursor);
-                                dbUtil.CloseDB(db);
-                            }
-                        }
-                        else*/
                         {// user not exist
                             Toast toast = Toast.makeText(
                                     getApplicationContext(),
@@ -257,16 +199,8 @@ public class FullScreenLoginActivity extends Activity {
 
                         break;
                     }
-                    // case Network.RESULT_NET_ERROR:
-                    // {
-                    // Toast toast = Toast.makeText(getApplicationContext(),
-                    // getText(R.string.msg_net_error),
-                    // Toast.LENGTH_LONG);
-                    // toast.setGravity(Gravity.CENTER, 0, 0);
-                    // toast.show();
-                    // return;
-                    // }
-                    case Network.RESULT_FALSE:
+                    default:
+//                    case Network.RESULT_FALSE:
                     {
                         Toast toast = Toast.makeText(getApplicationContext(),
                                 getText(R.string.msg_user_wrong),
@@ -279,8 +213,6 @@ public class FullScreenLoginActivity extends Activity {
                         return;
                     }
 
-                    default:
-                        break;
                 }
 
             }

RA Image/app/src/main/java/com/usai/util/Network.java

@@ -944,7 +944,7 @@ public class Network
 //		file.delete();
 		if (jstr == null || jstr.length() <= 0)
 		{
-			Log.d(TAG, "json is wrong");
+			Log.d(TAG, "json is null");
 			try {
 				return new JSONObject("{result:" + Network.RESULT_NET_ERROR+ "}");
 			} catch (JSONException e) {
@@ -952,6 +952,7 @@ public class Network
 			}
 
 		}
+		Log.d(TAG, "json string:"+jstr);
 		JSONObject jsobj;
 		try
 		{
@@ -970,7 +971,7 @@ public class Network
 		catch (JSONException e)
 		{
 			// TODO Auto-generated catch block
-			dbgUtil.fileLog(e.toString());
+			Log.d(TAG, "json format wrong:"+jstr);
 			e.printStackTrace();
 //			try {
 //				return new JSONObject("{result:" + Network.RESULT_NET_ERROR+ "}");

RA Image/app/src/main/java/com/usai/util/RAUploadManager.java

@@ -336,6 +336,10 @@ public class RAUploadManager {
 //                            uiUpdateListener.updateList();
 
 
+                    }
+                    else
+                    {
+                        saveTasks();
                     }
 
                     Log.d("_synchronized", "OperationCallback operateFinish: end" + (System.currentTimeMillis() - timeStart));
@@ -424,7 +428,11 @@ public class RAUploadManager {
         }
         for(Bundle b:arr_queue)
         {
-            startTask(b);
+
+            TaskStatus status= TaskStatus.values()[b.getInt("status",0)];
+
+            if (status!=TaskStatus.TaskStatusFinish&&status!=TaskStatus.TaskStatusError)
+                startTask(b);
         }
 //            int a = 0;
         // 此处缺少读取持久话保存任务队列的实现。

RA Image/app/src/main/java/com/usai/util/RAUtil.java

@@ -317,6 +317,7 @@ public class RAUtil {
         Set<String> keys = bundle.keySet();
         for (String key : keys) {
             try {
+                Log.d("", "Bundle2Json: key:"+key+"  val: "+wrap(bundle.get(key)));
                  json.put(key, wrap(bundle.get(key))); //see edit below
 //                json.put(key, JSONObject.wrap(bundle.get(key)));
             } catch(JSONException e) {

RA Image/app/src/main/res/layout/activity_full_screen_login.xml

@@ -205,10 +205,9 @@
 
             <Switch
                 android:id="@+id/sw_save"
-                style="@style/iOSSwitch"
-                android:layout_gravity="center"
                 android:layout_width="match_parent"
                 android:layout_height="0dp"
+                android:layout_gravity="center"
                 android:layout_weight="1"
 
                 android:paddingLeft="4dp"