RA Image Android

1 去掉自动上传，自动移除完成的任务，自动移除失败的任务的设置和执行逻辑。
2 修改程序逻辑，默认允许使用手机网络上传。
3 去掉internal server 设置

RA Image/app/app.iml

@@ -62,13 +62,6 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
@@ -76,6 +69,13 @@
       <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />

RA Image/app/build.gradle

@@ -9,7 +9,7 @@ android {
         minSdkVersion 14
         targetSdkVersion 25
         versionCode 1
-        versionName "1.04.33789"
+        versionName "1.05.33789"
     }
 
     buildTypes {

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

@@ -14,7 +14,6 @@ import android.view.View;
 import android.view.View.OnClickListener;
 import android.widget.EditText;
 import android.widget.ImageButton;
-import android.widget.RadioGroup;
 import android.widget.Toast;
 
 public class ServerSettingActivity extends Activity
@@ -58,23 +57,23 @@ public class ServerSettingActivity extends Activity
 		SharedPreferences pref = RedAntApplication.getInstance()
 				.getSharedPreferences("RA Image", 0);
 
-		String ia = pref.getString("ia", null);
-		String ea = pref.getString("ea", null);
+//		String ia = pref.getString("ia", null);
+//		String ea = pref.getString("ea", null);
 		String aa = pref.getString("aa", null);
 		String station_name = pref.getString("station name", null);
-		RadioGroup rg = (RadioGroup) findViewById(R.id.radioGroup1);
+//		RadioGroup rg = (RadioGroup) findViewById(R.id.radioGroup1);
 
-		if (!TextUtils.isEmpty(aa) && aa.equals(ia))
-			rg.check(R.id.radio0);
+//		if (!TextUtils.isEmpty(aa) && aa.equals(ia))
+//			rg.check(R.id.radio0);
 
-		if (!TextUtils.isEmpty(aa) && aa.equals(ea))
-			rg.check(R.id.radio1);
+//		if (!TextUtils.isEmpty(aa) && aa.equals(ea))
+//			rg.check(R.id.radio1);
 
 		EditText et_ia = (EditText) findViewById(R.id.et_ia);
-		EditText et_ea = (EditText) findViewById(R.id.et_ea);
+//		EditText et_ea = (EditText) findViewById(R.id.et_ea);
 		EditText et_name = (EditText) findViewById(R.id.et_name);
-		et_ea.setText(ea);
-		et_ia.setText(ia);
+//		et_ea.setText(ea);
+		et_ia.setText(aa);
 		et_name.setText(station_name);
 
 		ImageButton ibtn = (ImageButton) findViewById(R.id.ibtn_scan);
@@ -126,17 +125,27 @@ public class ServerSettingActivity extends Activity
 					return ;//Network.RESULT_NET_ERROR;
 				}	
 				String address[]=jstr.split(";");
-				if (address.length<3)
+				EditText et_ia = (EditText) findViewById(R.id.et_ia);
+//				EditText et_ea = (EditText) findViewById(R.id.et_ea);
+				EditText et_name = (EditText) findViewById(R.id.et_name);
+				if (address.length==3)
+				{
+					et_ia.setText(address[2].trim());
+					et_name.setText(address[0].trim());
+				}
+				else if(address.length==2)
+				{
+					et_ia.setText(address[1].trim());
+					et_name.setText(address[0].trim());
+				}
+				else
 				{
 					toast();
 					return;
 				}
-				EditText et_ia = (EditText) findViewById(R.id.et_ia);
-				EditText et_ea = (EditText) findViewById(R.id.et_ea);
-				EditText et_name = (EditText) findViewById(R.id.et_name);
-				et_ea.setText(address[2].trim());
-				et_ia.setText(address[1].trim());
-				et_name.setText(address[0].trim());
+
+//				et_ea.setText(address[2].trim());
+
 //				JSONObject jsobj;
 //				try
 //				{
@@ -191,20 +200,24 @@ public class ServerSettingActivity extends Activity
 		if (id == R.id.action_save)
 		{
 			EditText et_ia = (EditText) findViewById(R.id.et_ia);
-			EditText et_ea = (EditText) findViewById(R.id.et_ea);
+//			EditText et_ea = (EditText) findViewById(R.id.et_ea);
 			EditText et_name = (EditText) findViewById(R.id.et_name);
 			String ia = et_ia.getText().toString();
-			String ea = et_ea.getText().toString();
+//			String ea = et_ea.getText().toString();
 			String name = et_name.getText().toString();
-			if (TextUtils.isEmpty(ia) && TextUtils.isEmpty(ea))
+			if (TextUtils.isEmpty(ia) )
 			{
-				showdialog("Active server address can not be empty!");
+				showdialog("Server address can not be empty!");
 				return true;
 			}
 
 			SharedPreferences pref = RedAntApplication.getInstance()
 					.getSharedPreferences("RA Image", 0);
 			SharedPreferences.Editor editor = pref.edit();
+
+			editor.putString("aa", ia);
+			RedAntApplication.active_address = ia;
+
 			if (TextUtils.isEmpty(name))
 			{
 				showdialog("Station name can not be empty!");
@@ -214,46 +227,47 @@ public class ServerSettingActivity extends Activity
 				
 				editor.putString("station name", name);
 			}
-			if (!TextUtils.isEmpty(ia))
-			{
+//			if (!TextUtils.isEmpty(ia))
+//			{
+//
+//				if (!ia.substring(ia.length() - 1).equals("/"))
+//					ia = ia + "/";
+//				editor.putString("ia", ia);
+//			}
+//			if (!TextUtils.isEmpty(ea))
+//			{
+//				if (!ea.substring(ea.length() - 1).equals("/"))
+//					ea = ea + "/";
+//				editor.putString("ea", ea);
+//			}
+//			RadioGroup rg = (RadioGroup) findViewById(R.id.radioGroup1);
+//			if (rg.getCheckedRadioButtonId() == R.id.radio0)
+//			{
+//				if (!TextUtils.isEmpty(ia))
+//				{
+//					editor.putString("aa", ia);
+//					RedAntApplication.active_address = ia;
+//				}
+//				else
+//				{
+//					showdialog("Active server address can not be empty!");
+//					return true;
+//				}
+//			}
+//			else
+//			{
+//				if (!TextUtils.isEmpty(ea))
+//				{
+//					editor.putString("aa", ea);
+//					RedAntApplication.active_address = ea;
+//				}
+//				else
+//				{
+//					showdialog("Active server address can not be empty!");
+//					return true;
+//				}
+//			}
 
-				if (!ia.substring(ia.length() - 1).equals("/"))
-					ia = ia + "/";
-				editor.putString("ia", ia);
-			}
-			if (!TextUtils.isEmpty(ea))
-			{
-				if (!ea.substring(ea.length() - 1).equals("/"))
-					ea = ea + "/";
-				editor.putString("ea", ea);
-			}
-			RadioGroup rg = (RadioGroup) findViewById(R.id.radioGroup1);
-			if (rg.getCheckedRadioButtonId() == R.id.radio0)
-			{
-				if (!TextUtils.isEmpty(ia))
-				{
-					editor.putString("aa", ia);
-					RedAntApplication.active_address = ia;
-				}
-				else
-				{
-					showdialog("Active server address can not be empty!");
-					return true;
-				}
-			}
-			else
-			{
-				if (!TextUtils.isEmpty(ea))
-				{
-					editor.putString("aa", ea);
-					RedAntApplication.active_address = ea;
-				}
-				else
-				{
-					showdialog("Active server address can not be empty!");
-					return true;
-				}
-			}
 			RedAntApplication.station_name = name;
 
 			editor.remove("Lat");

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

@@ -37,7 +37,7 @@ public class uploadSettingActivity extends AppCompatActivity {
 //        boolean auto_rm_er = false;
         boolean compress = true;
 
-        boolean wifionly = true;
+        boolean wifionly = false;
         int retry_count = 5;
 
         int retry_waiting = 300;

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

@@ -1,11 +1,8 @@
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:paddingBottom="@dimen/activity_vertical_margin"
-    android:paddingLeft="@dimen/activity_horizontal_margin"
-    android:paddingRight="@dimen/activity_horizontal_margin"
-    android:paddingTop="@dimen/activity_vertical_margin"
     tools:context="com.usai.redant.raimage.ServerSettingActivity">
 
     <TextView
@@ -13,16 +10,46 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="Name"
-        android:textAppearance="?android:attr/textAppearanceMedium" />
+        android:textAppearance="?android:attr/textAppearanceMedium"
+        tools:layout_constraintTop_creator="1"
+        tools:layout_constraintRight_creator="1"
+        android:layout_marginTop="24dp"
+        app:layout_constraintTop_toTopOf="parent"
+        android:layout_marginLeft="24dp"
+        app:layout_constraintLeft_toLeftOf="parent" />
+
+    <TextView
+        android:id="@+id/textView3"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Server"
+        android:textAppearance="?android:attr/textAppearanceMedium"
+        tools:layout_constraintBottom_creator="1"
+        tools:layout_constraintLeft_creator="1"
+        android:layout_marginLeft="0dp"
+        app:layout_constraintLeft_toLeftOf="@+id/tv_name"
+        android:layout_marginTop="32dp"
+        app:layout_constraintTop_toBottomOf="@+id/tv_name" />
 
     <EditText
         android:id="@+id/et_name"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_alignBaseline="@+id/tv_name"
-        android:layout_toRightOf="@+id/tv_name"
+        android:layout_marginLeft="8dp"
+        android:layout_marginRight="24dp"
         android:ems="10"
-        android:singleLine="true">
+        android:singleLine="true"
+        app:layout_constraintLeft_toRightOf="@+id/tv_name"
+        app:layout_constraintRight_toRightOf="parent"
+        tools:layout_constraintBaseline_creator="1"
+        tools:layout_constraintLeft_creator="1"
+        tools:layout_constraintRight_creator="1"
+        app:layout_constraintTop_toTopOf="@+id/tv_name"
+        android:layout_marginTop="0dp"
+        app:layout_constraintHorizontal_bias="0.0"
+        app:layout_constraintBottom_toBottomOf="@+id/tv_name"
+        android:layout_marginBottom="0dp"
+        app:layout_constraintVertical_bias="0.478">
 
         <requestFocus />
     </EditText>
@@ -31,47 +58,37 @@
         android:id="@+id/ibtn_scan"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_centerHorizontal="true"
-        android:layout_centerVertical="true"
-        android:src="@drawable/ic_action_scan" />
+        android:src="@drawable/ic_action_scan"
+        tools:layout_constraintTop_creator="1"
+        tools:layout_constraintRight_creator="1"
+        android:layout_marginEnd="112dp"
+        android:layout_marginRight="8dp"
+        app:layout_constraintRight_toRightOf="parent"
+        android:layout_marginLeft="8dp"
+        app:layout_constraintLeft_toLeftOf="parent"
+        android:layout_marginTop="8dp"
+        app:layout_constraintTop_toBottomOf="@+id/et_ia"
+        app:layout_constraintBottom_toBottomOf="parent"
+        android:layout_marginBottom="8dp"
+        app:layout_constraintVertical_bias="0.26" />
 
-    <RadioGroup
-        android:id="@+id/radioGroup1"
-        android:layout_width="match_parent"
+    <EditText
+        android:id="@+id/et_ia"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_alignLeft="@+id/tv_name"
-        android:layout_below="@+id/tv_name"
-        android:layout_marginTop="10dp">
-
-        <RadioButton
-            android:id="@+id/radio0"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:checked="true"
-            android:text="Internal address" />
-
-        <EditText
-            android:id="@+id/et_ia"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:ems="10"
-            android:singleLine="true" />
-
-        <RadioButton
-            android:id="@+id/radio1"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="0dp"
-            android:text="External address" />
-
-        <EditText
-            android:id="@+id/et_ea"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_alignLeft="@+id/radioGroup1"
-            android:layout_below="@+id/radioGroup1"
-            android:ems="10"
-            android:singleLine="true" />
-    </RadioGroup>
+        android:ems="10"
+        android:singleLine="true"
+        tools:layout_constraintTop_creator="1"
+        tools:layout_constraintRight_creator="1"
+        android:layout_marginStart="8dp"
+        android:layout_marginEnd="8dp"
+        app:layout_constraintRight_toRightOf="@+id/et_name"
+        tools:layout_constraintLeft_creator="1"
+        app:layout_constraintLeft_toLeftOf="@+id/textView3"
+        android:layout_marginLeft="0dp"
+        android:layout_marginRight="0dp"
+        app:layout_constraintHorizontal_bias="0.0"
+        android:layout_marginTop="16dp"
+        app:layout_constraintTop_toBottomOf="@+id/textView3" />
 
-</RelativeLayout>
+</android.support.constraint.ConstraintLayout>