1

app/src/main/java/com/polysoft/nafmii/fragment/home/ModuleUrlHandle.java

@@ -33,18 +33,31 @@ public class ModuleUrlHandle {
     }
 
     public String getModuleUrl(ModulesEnum module) {
-        Intent intent = activity.getIntent();
-        String url = intent.getStringExtra(module.name);
+        String url = getInputUrl(module);
         if (!TextUtils.isEmpty(url)) {
             return url;
         }
         if (module == ModulesEnum.LEARN) {
             return Constants.MODULE_URL_LEARN;
         }
+
         String indexUrl = Uri.fromFile(FileUtils.getIndex()).toString();
         return indexUrl + module.webUrl;
     }
 
+    private String getInputUrl(ModulesEnum module) {
+        Intent intent = activity.getIntent();
+        if (module == ModulesEnum.HOME || module == ModulesEnum.MEMBER || module == ModulesEnum.MY) {
+            String urlStr = intent.getStringExtra(ModulesEnum.HOME.name);
+            if (TextUtils.isEmpty(urlStr)) {
+                return null;
+            }
+            Uri uri = Uri.parse(urlStr);
+            return uri.getScheme() +":"+ uri.getSchemeSpecificPart() + module.webUrl;
+        }
+        return intent.getStringExtra(ModulesEnum.HOME.name);
+    }
+
     public interface IModuleHandle {
 
         ModulesEnum getModule();
@@ -79,6 +92,7 @@ public class ModuleUrlHandle {
         }
     }
 
+
     class ModuleUrlImpl implements IModuleHandle {
         private final ModulesEnum module;
 
@@ -98,5 +112,4 @@ public class ModuleUrlHandle {
         }
     }
 
-
 }

app/src/main/java/com/polysoft/nafmii/utils/IntentUtils.java

@@ -10,6 +10,10 @@ import android.os.Environment;
 import android.os.Parcelable;
 import android.provider.MediaStore;
 
+import com.whaty.nafmii.BuildConfig;
+import com.whaty.nafmii.activity.HomeActivity;
+import com.whaty.nafmii.activity.InputUrlActivity;
+
 import java.io.File;
 
 public class IntentUtils {
@@ -56,6 +60,14 @@ public class IntentUtils {
         return intent;
     }
 
+    public static void toHomeActivity(Activity activity) {
+        if (BuildConfig.DEBUG) {
+            startActivity(activity, InputUrlActivity.class);
+        } else {
+            startActivity(activity, HomeActivity.class);
+        }
+    }
+
     public static void startActivity(Activity activity, Class<? extends Activity> target) {
         startActivity(activity, new Intent(activity, target));
     }

app/src/main/java/com/polysoft/nafmii/viewmodel/AdvertisementViewModel.java

@@ -80,9 +80,9 @@ public class AdvertisementViewModel extends ViewModel {
         }
 
         public boolean empty() {
-//            if (BuildConfig.DEBUG) {
-//                return true;
-//            }
+            if (BuildConfig.DEBUG) {
+                return true;
+            }
             return TextUtils.isEmpty(data);
         }
     }

app/src/main/java/com/whaty/nafmii/activity/AdvertisementWebviewActvity.java

@@ -16,10 +16,6 @@ public class AdvertisementWebviewActvity extends WebviewActivity{
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_advertisement);
-    }
-
-    @Override
-    public void onCoreInitFinished(boolean flag) {
         initView();
     }
 

app/src/main/java/com/whaty/nafmii/activity/HomeActivity.java

@@ -28,6 +28,7 @@ public class HomeActivity extends WebviewActivity implements View.OnClickListene
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        super.setContentView(R.layout.activity_home);
         this.initView();
         this.initHomeModule();
     }

app/src/main/java/com/whaty/nafmii/activity/InputUrlActivity.java

@@ -8,6 +8,7 @@ import android.widget.RadioButton;
 
 import androidx.appcompat.app.AppCompatActivity;
 
+import com.polysoft.nafmii.utils.IntentUtils;
 import com.polysoft.nafmii.utils.SpUtils;
 import com.polysoft.nafmii.utils.ToastUtils;
 import com.whaty.nafmii.R;
@@ -63,6 +64,6 @@ public class InputUrlActivity extends AppCompatActivity {
 
         Intent intent = new Intent(this, HomeActivity.class);
         intent.putExtra(channel, url);
-        super.startActivity(intent);
+        IntentUtils.startActivity(this, intent);
     }
 }
\ No newline at end of file

app/src/main/java/com/whaty/nafmii/activity/MainActivity.java

@@ -53,7 +53,7 @@ public class MainActivity extends BaseActivity {
             SpUtils.putBoolean(FIRST_RUN_KEY, true);
         } else if (IActivityEvent.EVENT_ADVERTISEMENT.equals(event)) {
         }
-        IntentUtils.startActivity(this, HomeActivity.class);
+        IntentUtils.toHomeActivity(this);
     }
 
     private void checkAndRequestPermission() {

app/src/main/java/com/whaty/nafmii/activity/TestHomeActivity.java

@@ -36,11 +36,6 @@ public class TestHomeActivity extends WebviewActivity implements View.OnClickLis
         this.initHomeModule();
     }
 
-    @Override
-    public void onCoreInitFinished(boolean flag) {
-
-    }
-
     private void initView() {
         this.footerView = super.findViewById(R.id.home_footer_group);
         this.footerView.setVisibility(View.VISIBLE);
@@ -56,7 +51,6 @@ public class TestHomeActivity extends WebviewActivity implements View.OnClickLis
         }
 
         this.moduleViewsMap = modulesMap;
-
     }
 
     private void initHomeModule() {