詹子聪 5 gadi atpakaļ
vecāks
revīzija
85367da851

+ 2 - 2
app/build.gradle

@@ -34,12 +34,12 @@ android {
     productFlavors {
         dev {
             // 开发环境宿舍服务器
-            buildConfigField("String", "BASE_URL", '"http://192.168.0.190:8080"')
+            buildConfigField("String", "BASE_URL", '"http://192.168.0.190:8080/"')
         }
 
         rel {
             // todo 正式上线
-            buildConfigField("String", "BASE_URL", '"http://188.168.0.190:8080"')
+            buildConfigField("String", "BASE_URL", '"http://app.jianjie.life:11111/shibei/"')
         }
     }
 

+ 3 - 0
app/src/main/java/com/itant/shibei/constant/ConstantUrl.java

@@ -24,6 +24,9 @@ public interface ConstantUrl {
      */
     String URL_BIAO_QING = "https://app.xuty.tk/static/app/index.html";
 
+    /**京东联盟地址*/
+    String URL_JD_UNION = "https://union.jd.com/proManager/index?pageNo=1";
+
 
     /**
      * 美团优惠1

+ 1 - 1
app/src/main/java/com/itant/shibei/ui/home/tool/json/JsonActivity.java

@@ -18,7 +18,7 @@ import com.miekir.common.utils.ToastTool;
 import com.miekir.mvp.presenter.InjectPresenter;
 
 public class JsonActivity extends BaseBeiActivity implements View.OnClickListener, IJsonView {
-    private static final String FORMAT_URL = "%s/shibei/api/getJson?email=%s";
+    private static final String FORMAT_URL = "/%s/shibei/api/getJson?email=%s";
 
     @InjectPresenter
     JsonPresenter jsonPresenter;

+ 1 - 1
app/src/main/java/com/itant/shibei/ui/home/tool/weather/WeatherActivity.java

@@ -18,7 +18,7 @@ import com.miekir.common.utils.ToastTool;
  * 天气界面
  */
 public class WeatherActivity extends BaseBeiActivity implements View.OnClickListener {
-    private static final String FORMAT_URL = "%s/shibei/api/getWeather?token=%s";
+    private static final String FORMAT_URL = "/%s/shibei/api/getWeather?token=%s";
 
     private BeiUser mUser;
 

+ 1 - 1
app/src/main/java/com/itant/shibei/ui/home/tool/yiji/YijiActivity.java

@@ -18,7 +18,7 @@ import com.miekir.common.utils.ToastTool;
  * 黄历界面
  */
 public class YijiActivity extends BaseBeiActivity implements View.OnClickListener {
-    private static final String FORMAT_URL = "%s/shibei/api/getYiji?token=%s";
+    private static final String FORMAT_URL = "/%s/shibei/api/getYiji?token=%s";
 
     private BeiUser mUser;
 

+ 27 - 0
app/src/main/java/com/itant/shibei/ui/mine/goods/AddGoodsActivity.java

@@ -3,13 +3,19 @@ package com.itant.shibei.ui.mine.goods;
 import android.content.Intent;
 import android.os.Bundle;
 import android.text.TextUtils;
+import android.view.Menu;
+import android.view.MenuItem;
 import android.view.View;
 import android.widget.CheckBox;
 
+import androidx.annotation.NonNull;
+
 import com.google.android.material.textfield.TextInputEditText;
 import com.itant.shibei.R;
 import com.itant.shibei.base.BaseBeiActivity;
+import com.itant.shibei.constant.ConstantUrl;
 import com.itant.shibei.ui.home.goods.GoodsBean;
+import com.miekir.common.utils.ActivityTool;
 import com.miekir.common.utils.ToastTool;
 import com.miekir.common.utils.ViewTool;
 import com.miekir.mvp.presenter.InjectPresenter;
@@ -48,6 +54,27 @@ public class AddGoodsActivity extends BaseBeiActivity implements View.OnClickLis
         return R.layout.activity_goods_add;
     }
 
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        getMenuInflater().inflate(R.menu.menu_done, menu);
+        MenuItem item = menu.findItem(R.id.action_done);
+        item.setTitle("  返利链接  ");
+        return super.onCreateOptionsMenu(menu);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(@NonNull MenuItem item) {
+        switch (item.getItemId()) {
+            case R.id.action_done:
+                // 注册
+                ActivityTool.openUrl(this, ConstantUrl.URL_JD_UNION);
+                break;
+            default:
+                break;
+        }
+        return super.onOptionsItemSelected(item);
+    }
+
     @Override
     public void initViews(Bundle savedInstanceState) {
         et_goods_title = findViewById(R.id.et_goods_title);

+ 2 - 2
network/build.gradle

@@ -30,12 +30,12 @@ android {
     productFlavors {
         dev {
             // 开发环境宿舍服务器
-            buildConfigField("String", "BASE_URL", '"http://192.168.0.190:8080"')
+            buildConfigField("String", "BASE_URL", '"http://192.168.0.190:8080/"')
         }
 
         rel {
             // todo 正式上线
-            buildConfigField("String", "BASE_URL", '"http://188.168.0.190:8080"')
+            buildConfigField("String", "BASE_URL", '"http://app.jianjie.life:11111/shibei/"')
         }
     }
 }