Organize the code, remove some useless classes and resource files -- 整理代码，去掉一些无用的类和资源文件

Inactive account home interface displays an error -- 未激活账号home 界面显示错误(resolve: #14407)
Added prompt for inactive accounts --增加未激活账号提示(resolve: #14406)
Add sign up call -- 增加sign up 调用(resolve:#14405)
Added no rerecord display for dashboard without record -- 没有记录的dashboard 增加no rerecord 显示(resolve: #14396)
Optimize UI layout and display -- 优化界面布局和显示(issue40: #14395)

ApexDrivers/ratradefiling/src/main/java/com/usai/ratradefiling/TradeFilingApplication.java

@@ -607,6 +607,9 @@ public class TradeFilingApplication extends Application implements RAProviderHel
 		Log.d(TAG, "get_company_list");
 
 		try {
+
+			if(m_company_list.length()==0)
+				return "";
 			String company= m_company_list.getJSONObject(m_current_company_idx).optString("name","");
 			return company;
 

ApexDrivers/ratradefiling/src/main/java/com/usai/ratradefiling/home/HomeFragment.java

@@ -4,6 +4,7 @@ import android.app.Activity;
 import android.app.ProgressDialog;
 import android.content.BroadcastReceiver;
 import android.content.Context;
+import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.os.Bundle;
@@ -32,6 +33,7 @@ import com.usai.ratradefiling.R;
 //import com.usai.ratradefiling.SaveInstanceHelper;
 //import com.usai.ratradefiling.badgeview.BadgeView;
 import com.usai.ratradefiling.RootActivity;
+import com.usai.ratradefiling.TradeFilingApplication;
 import com.usai.ratradefiling.base.ResultBaseModel;
 import com.usai.ratradefiling.dataprovider.RADataProvider;
 //import com.usai.ratradefiling.message.MessageActivity;
@@ -53,6 +55,7 @@ import com.usai.ratradefiling.home.dashmodel.pending.HomeDashACEM1ModelP;
 import com.usai.ratradefiling.home.dashmodel.pending.HomeDashACIModelP;
 import com.usai.ratradefiling.home.dashmodel.pending.HomeDashISFModelP;
 import com.usai.ratradefiling.home.dashmodel.pending.HomeDasheManifestModelP;
+import com.usai.ratradefiling.login.RetrievePasswordActivity;
 import com.usai.redant.rautils.actionsheet.ActionSheet;
 import com.usai.redant.rautils.utils.Network;
 
@@ -213,6 +216,9 @@ public class HomeFragment extends Fragment
     }
     private void handleRowAction(final HomeSectionModel sectionModel,ResultBaseModel rowModel) {
 
+
+        if(rowModel.type==DashResultTypeEmpty.ordinal())
+            return;
         JSONArray rowActions = sectionModel.row_actions;
         if (rowActions != null) {
 
@@ -413,6 +419,9 @@ public class HomeFragment extends Fragment
                 loadData();
             }
         } // initial
+
+
+        checkActivation();
     }
 
     @Override
@@ -530,6 +539,34 @@ public class HomeFragment extends Fragment
 //        mHeaderView.setExistNewMessage(mHeaderModel.message_count > 0);
 //    }
 
+    void checkActivation()
+    {
+
+        if(!TradeFilingApplication.getInstance().userActive())
+        {
+            android.app.AlertDialog.Builder builder = new android.app.AlertDialog.Builder(
+                    getActivity());
+            builder.setMessage(getString(R.string.inactive_message));
+
+            builder.setTitle(getString(R.string.message));
+
+            builder.setPositiveButton(getString(android.R.string.ok), new DialogInterface.OnClickListener()
+            {
+
+                @Override
+                public void onClick(DialogInterface dialog, int which)
+                {
+                    dialog.dismiss();
+
+                }
+            });
+
+            builder.create().show();
+        }
+
+
+    }
+
     private void registBroadcastReceiver()
     {
         IntentFilter intentFilter = new IntentFilter();
@@ -648,6 +685,8 @@ public class HomeFragment extends Fragment
 
                 String headertext = "<center><font size=5 color=white><b>In 30 Days</b>";
 
+                if(totaljson== null)
+                    totaljson = new JSONObject();
                 if(totaljson.has("acem1"))
                 {
 
@@ -1520,9 +1559,10 @@ public class HomeFragment extends Fragment
         {
             if (orders == null)
             {
-                return 0;
+                return 1;
             }
-
+            if(orders.size()==0)
+                return 1;
             return orders.size();
         }
 
@@ -1627,6 +1667,14 @@ public class HomeFragment extends Fragment
 
         ResultBaseModel orderModelForIndex(int index)
         {
+            if(orders.size()==0)
+            {
+                ResultBaseModel model = new ResultBaseModel();
+                model.type =  DashResultTypeEmpty.ordinal();
+                return model;
+            }
+
+
             if (index >= orders.size())
             {
                 return null;

ApexDrivers/ratradefiling/src/main/java/com/usai/ratradefiling/login/LoginFragment.java

@@ -33,6 +33,7 @@ import com.usai.ratradefiling.TradeFilingApplication;
 import com.usai.ratradefiling.dataprovider.OnlineDataProvider;
 import com.usai.ratradefiling.R;
 import com.usai.ratradefiling.dataprovider.RADataProvider;
+import com.usai.ratradefiling.signup.SignupActivity;
 import com.usai.ratradefiling.utils.AES;
 
 import org.json.JSONException;
@@ -217,7 +218,21 @@ public class LoginFragment extends Fragment/* implements OnClickListener */
 						// showProgress(true);
 					}
 				});
-		
+
+
+		view.findViewById(R.id.tv_sign_up).setOnClickListener(
+				new View.OnClickListener() {
+					@Override
+					public void onClick(View view) {
+						Intent intent = new Intent();
+						intent.setClass(getActivity(), SignupActivity.class);
+						startActivity(intent);
+						// showProgress(true);
+					}
+				});
+
+
+
 		view.findViewById(R.id.tv_retrieve_pass).setOnClickListener(
 				new View.OnClickListener() {
 					@Override

ApexDrivers/ratradefiling/src/main/res/layout/fragment_login.xml

@@ -1,128 +0,0 @@
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-     >
-
-    <!-- Login progress -->
-
-    <LinearLayout
-        android:id="@+id/login_status"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignTop="@+id/login_form"
-        android:layout_centerHorizontal="true"
-        android:layout_gravity="center"
-        android:gravity="center_horizontal"
-        android:orientation="vertical"
-        android:visibility="gone" >
-
-        <ProgressBar
-            style="?android:attr/progressBarStyleLarge"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="8dp" />
-
-        <TextView
-            android:id="@+id/login_status_message"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="16dp"
-            android:text="@string/login_progress_signing_in"
-            android:textAppearance="?android:attr/textAppearanceMedium" />
-    </LinearLayout>
-
-    <!-- Login form -->
-
-    <LinearLayout
-        android:id="@+id/login_form"
-        style="@style/LoginFormContainer"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:orientation="vertical" >
-
-        <EditText
-            android:id="@+id/user"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:hint="@string/prompt_user"
-            android:inputType="textAutoComplete"
-            android:maxLines="1"
-            android:singleLine="true"
-            android:text="" />
-
-        <EditText
-            android:id="@+id/password"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:hint="@string/prompt_password"
-            android:imeActionId="1024"
-            android:imeActionLabel="@string/action_sign_in_short"
-            android:imeOptions="actionUnspecified"
-            android:inputType="textPassword"
-            android:maxLines="1"
-            android:singleLine="true"
-            android:text="" />
-
-        <RelativeLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content" >
-
-            <CheckBox
-                android:id="@+id/cb_save"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignBottom="@+id/tv_login"
-                android:checked="true"
-                android:text="@string/str_savepass"
-                android:visibility="invisible" />
-
-            <Button
-                android:id="@+id/tv_login"
-                android:layout_width="wrap_content"
-                android:layout_height="39dp"
-                android:layout_alignParentRight="true"
-                android:layout_alignParentTop="true"
-                android:background="@drawable/btn_bg"
-                android:paddingLeft="32dp"
-                android:paddingRight="32dp"
-                android:text="@string/action_sign_in_register" />
-
-        </RelativeLayout>
-
-        <TextView
-            android:id="@+id/tv_retrieve_pass"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="5dp"
-            android:layout_marginTop="5dp"
-            android:clickable="true"
-            android:focusable="true"
-            android:text="@string/str_retrievepass"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:textColor="@android:color/holo_blue_dark" />
-
-    </LinearLayout>
-
-
-
-    <TextView
-        android:id="@+id/tv_ver"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentLeft="true"
-        android:layout_alignParentTop="true"
-        android:layout_margin="10dp"
-        android:text="TextView" />
-
-    <ImageView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_above="@id/login_form"
-        android:layout_below="@id/tv_ver"
-        android:layout_centerHorizontal="true"
-        android:contentDescription="TODO"
-        android:src="@drawable/action_setting" />
-
-</RelativeLayout>

ApexDrivers/ratradefiling/src/main/res/values-zh/strings.xml

@@ -56,6 +56,7 @@
     <string name="str_del">Del</string>
 
     <!--Login-->
+    <string name="inactive_message">Our customer service will contact you to assist you complete the user activation.</string>
     <string name="login_progress_signing_in">Login&#8230;</string>
     <string name="str_email_sent">Email has been sent.</string>
     <string name="str_retrieve_success">Retrieve successfully!</string>

ApexDrivers/ratradefiling/src/main/res/values/strings.xml

@@ -56,6 +56,8 @@
     <string name="str_del">Del</string>
 
     <!--Login-->
+    <string name="inactive_message">Our customer service will contact you to assist you complete the user activation.</string>
+
     <string name="login_progress_signing_in">Login&#8230;&#8230;&#8230;</string>
     <string name="str_email_sent">Email has been sent.</string>
     <string name="str_retrieve_success">Retrieve successfully!</string>