[修改]修复个别机型Web显示不正确

app/src/main/java/com/sheep/gamegroup/greendao/download/DaoMaster.java

@@ -21,28 +21,28 @@ public class DaoMaster extends AbstractDaoMaster {
 
     /** Creates underlying database table using DAOs. */
     public static void createAllTables(Database db, boolean ifNotExists) {
-        AcceptTaskRecordDao.createTable(db, ifNotExists);
-        AccountDao.createTable(db, ifNotExists);
         AppdownloadBeanDao.createTable(db, ifNotExists);
+        SheepAdDao.createTable(db, ifNotExists);
         DownLoadInfoDao.createTable(db, ifNotExists);
+        SearchRecordDao.createTable(db, ifNotExists);
+        AccountDao.createTable(db, ifNotExists);
+        SdkLoginUserDao.createTable(db, ifNotExists);
         ProcessRecordDao.createTable(db, ifNotExists);
+        AcceptTaskRecordDao.createTable(db, ifNotExists);
         ScreenShotRecordDao.createTable(db, ifNotExists);
-        SdkLoginUserDao.createTable(db, ifNotExists);
-        SearchRecordDao.createTable(db, ifNotExists);
-        SheepAdDao.createTable(db, ifNotExists);
     }
 
     /** Drops underlying database table using DAOs. */
     public static void dropAllTables(Database db, boolean ifExists) {
-        AcceptTaskRecordDao.dropTable(db, ifExists);
-        AccountDao.dropTable(db, ifExists);
         AppdownloadBeanDao.dropTable(db, ifExists);
+        SheepAdDao.dropTable(db, ifExists);
         DownLoadInfoDao.dropTable(db, ifExists);
+        SearchRecordDao.dropTable(db, ifExists);
+        AccountDao.dropTable(db, ifExists);
+        SdkLoginUserDao.dropTable(db, ifExists);
         ProcessRecordDao.dropTable(db, ifExists);
+        AcceptTaskRecordDao.dropTable(db, ifExists);
         ScreenShotRecordDao.dropTable(db, ifExists);
-        SdkLoginUserDao.dropTable(db, ifExists);
-        SearchRecordDao.dropTable(db, ifExists);
-        SheepAdDao.dropTable(db, ifExists);
     }
 
     /**
@@ -61,15 +61,15 @@ public class DaoMaster extends AbstractDaoMaster {
 
     public DaoMaster(Database db) {
         super(db, SCHEMA_VERSION);
-        registerDaoClass(AcceptTaskRecordDao.class);
-        registerDaoClass(AccountDao.class);
         registerDaoClass(AppdownloadBeanDao.class);
+        registerDaoClass(SheepAdDao.class);
         registerDaoClass(DownLoadInfoDao.class);
+        registerDaoClass(SearchRecordDao.class);
+        registerDaoClass(AccountDao.class);
+        registerDaoClass(SdkLoginUserDao.class);
         registerDaoClass(ProcessRecordDao.class);
+        registerDaoClass(AcceptTaskRecordDao.class);
         registerDaoClass(ScreenShotRecordDao.class);
-        registerDaoClass(SdkLoginUserDao.class);
-        registerDaoClass(SearchRecordDao.class);
-        registerDaoClass(SheepAdDao.class);
     }
 
     public DaoSession newSession() {

app/src/main/java/com/sheep/gamegroup/greendao/download/DaoSession.java

@@ -8,25 +8,25 @@ import org.greenrobot.greendao.database.Database;
 import org.greenrobot.greendao.identityscope.IdentityScopeType;
 import org.greenrobot.greendao.internal.DaoConfig;
 
-import com.sheep.gamegroup.greendao.download.AcceptTaskRecord;
-import com.sheep.gamegroup.greendao.download.Account;
 import com.sheep.gamegroup.greendao.download.AppdownloadBean;
+import com.sheep.gamegroup.greendao.download.SheepAd;
 import com.sheep.gamegroup.greendao.download.DownLoadInfo;
+import com.sheep.gamegroup.greendao.download.SearchRecord;
+import com.sheep.gamegroup.greendao.download.Account;
+import com.sheep.gamegroup.greendao.download.SdkLoginUser;
 import com.sheep.gamegroup.greendao.download.ProcessRecord;
+import com.sheep.gamegroup.greendao.download.AcceptTaskRecord;
 import com.sheep.gamegroup.greendao.download.ScreenShotRecord;
-import com.sheep.gamegroup.greendao.download.SdkLoginUser;
-import com.sheep.gamegroup.greendao.download.SearchRecord;
-import com.sheep.gamegroup.greendao.download.SheepAd;
 
-import com.sheep.gamegroup.greendao.download.AcceptTaskRecordDao;
-import com.sheep.gamegroup.greendao.download.AccountDao;
 import com.sheep.gamegroup.greendao.download.AppdownloadBeanDao;
+import com.sheep.gamegroup.greendao.download.SheepAdDao;
 import com.sheep.gamegroup.greendao.download.DownLoadInfoDao;
+import com.sheep.gamegroup.greendao.download.SearchRecordDao;
+import com.sheep.gamegroup.greendao.download.AccountDao;
+import com.sheep.gamegroup.greendao.download.SdkLoginUserDao;
 import com.sheep.gamegroup.greendao.download.ProcessRecordDao;
+import com.sheep.gamegroup.greendao.download.AcceptTaskRecordDao;
 import com.sheep.gamegroup.greendao.download.ScreenShotRecordDao;
-import com.sheep.gamegroup.greendao.download.SdkLoginUserDao;
-import com.sheep.gamegroup.greendao.download.SearchRecordDao;
-import com.sheep.gamegroup.greendao.download.SheepAdDao;
 
 // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT.
 
@@ -37,124 +37,124 @@ import com.sheep.gamegroup.greendao.download.SheepAdDao;
  */
 public class DaoSession extends AbstractDaoSession {
 
-    private final DaoConfig acceptTaskRecordDaoConfig;
-    private final DaoConfig accountDaoConfig;
     private final DaoConfig appdownloadBeanDaoConfig;
+    private final DaoConfig sheepAdDaoConfig;
     private final DaoConfig downLoadInfoDaoConfig;
+    private final DaoConfig searchRecordDaoConfig;
+    private final DaoConfig accountDaoConfig;
+    private final DaoConfig sdkLoginUserDaoConfig;
     private final DaoConfig processRecordDaoConfig;
+    private final DaoConfig acceptTaskRecordDaoConfig;
     private final DaoConfig screenShotRecordDaoConfig;
-    private final DaoConfig sdkLoginUserDaoConfig;
-    private final DaoConfig searchRecordDaoConfig;
-    private final DaoConfig sheepAdDaoConfig;
 
-    private final AcceptTaskRecordDao acceptTaskRecordDao;
-    private final AccountDao accountDao;
     private final AppdownloadBeanDao appdownloadBeanDao;
+    private final SheepAdDao sheepAdDao;
     private final DownLoadInfoDao downLoadInfoDao;
+    private final SearchRecordDao searchRecordDao;
+    private final AccountDao accountDao;
+    private final SdkLoginUserDao sdkLoginUserDao;
     private final ProcessRecordDao processRecordDao;
+    private final AcceptTaskRecordDao acceptTaskRecordDao;
     private final ScreenShotRecordDao screenShotRecordDao;
-    private final SdkLoginUserDao sdkLoginUserDao;
-    private final SearchRecordDao searchRecordDao;
-    private final SheepAdDao sheepAdDao;
 
     public DaoSession(Database db, IdentityScopeType type, Map<Class<? extends AbstractDao<?, ?>>, DaoConfig>
             daoConfigMap) {
         super(db);
 
-        acceptTaskRecordDaoConfig = daoConfigMap.get(AcceptTaskRecordDao.class).clone();
-        acceptTaskRecordDaoConfig.initIdentityScope(type);
-
-        accountDaoConfig = daoConfigMap.get(AccountDao.class).clone();
-        accountDaoConfig.initIdentityScope(type);
-
         appdownloadBeanDaoConfig = daoConfigMap.get(AppdownloadBeanDao.class).clone();
         appdownloadBeanDaoConfig.initIdentityScope(type);
 
+        sheepAdDaoConfig = daoConfigMap.get(SheepAdDao.class).clone();
+        sheepAdDaoConfig.initIdentityScope(type);
+
         downLoadInfoDaoConfig = daoConfigMap.get(DownLoadInfoDao.class).clone();
         downLoadInfoDaoConfig.initIdentityScope(type);
 
-        processRecordDaoConfig = daoConfigMap.get(ProcessRecordDao.class).clone();
-        processRecordDaoConfig.initIdentityScope(type);
+        searchRecordDaoConfig = daoConfigMap.get(SearchRecordDao.class).clone();
+        searchRecordDaoConfig.initIdentityScope(type);
 
-        screenShotRecordDaoConfig = daoConfigMap.get(ScreenShotRecordDao.class).clone();
-        screenShotRecordDaoConfig.initIdentityScope(type);
+        accountDaoConfig = daoConfigMap.get(AccountDao.class).clone();
+        accountDaoConfig.initIdentityScope(type);
 
         sdkLoginUserDaoConfig = daoConfigMap.get(SdkLoginUserDao.class).clone();
         sdkLoginUserDaoConfig.initIdentityScope(type);
 
-        searchRecordDaoConfig = daoConfigMap.get(SearchRecordDao.class).clone();
-        searchRecordDaoConfig.initIdentityScope(type);
+        processRecordDaoConfig = daoConfigMap.get(ProcessRecordDao.class).clone();
+        processRecordDaoConfig.initIdentityScope(type);
 
-        sheepAdDaoConfig = daoConfigMap.get(SheepAdDao.class).clone();
-        sheepAdDaoConfig.initIdentityScope(type);
+        acceptTaskRecordDaoConfig = daoConfigMap.get(AcceptTaskRecordDao.class).clone();
+        acceptTaskRecordDaoConfig.initIdentityScope(type);
+
+        screenShotRecordDaoConfig = daoConfigMap.get(ScreenShotRecordDao.class).clone();
+        screenShotRecordDaoConfig.initIdentityScope(type);
 
-        acceptTaskRecordDao = new AcceptTaskRecordDao(acceptTaskRecordDaoConfig, this);
-        accountDao = new AccountDao(accountDaoConfig, this);
         appdownloadBeanDao = new AppdownloadBeanDao(appdownloadBeanDaoConfig, this);
+        sheepAdDao = new SheepAdDao(sheepAdDaoConfig, this);
         downLoadInfoDao = new DownLoadInfoDao(downLoadInfoDaoConfig, this);
+        searchRecordDao = new SearchRecordDao(searchRecordDaoConfig, this);
+        accountDao = new AccountDao(accountDaoConfig, this);
+        sdkLoginUserDao = new SdkLoginUserDao(sdkLoginUserDaoConfig, this);
         processRecordDao = new ProcessRecordDao(processRecordDaoConfig, this);
+        acceptTaskRecordDao = new AcceptTaskRecordDao(acceptTaskRecordDaoConfig, this);
         screenShotRecordDao = new ScreenShotRecordDao(screenShotRecordDaoConfig, this);
-        sdkLoginUserDao = new SdkLoginUserDao(sdkLoginUserDaoConfig, this);
-        searchRecordDao = new SearchRecordDao(searchRecordDaoConfig, this);
-        sheepAdDao = new SheepAdDao(sheepAdDaoConfig, this);
 
-        registerDao(AcceptTaskRecord.class, acceptTaskRecordDao);
-        registerDao(Account.class, accountDao);
         registerDao(AppdownloadBean.class, appdownloadBeanDao);
+        registerDao(SheepAd.class, sheepAdDao);
         registerDao(DownLoadInfo.class, downLoadInfoDao);
+        registerDao(SearchRecord.class, searchRecordDao);
+        registerDao(Account.class, accountDao);
+        registerDao(SdkLoginUser.class, sdkLoginUserDao);
         registerDao(ProcessRecord.class, processRecordDao);
+        registerDao(AcceptTaskRecord.class, acceptTaskRecordDao);
         registerDao(ScreenShotRecord.class, screenShotRecordDao);
-        registerDao(SdkLoginUser.class, sdkLoginUserDao);
-        registerDao(SearchRecord.class, searchRecordDao);
-        registerDao(SheepAd.class, sheepAdDao);
     }
     
     public void clear() {
-        acceptTaskRecordDaoConfig.clearIdentityScope();
-        accountDaoConfig.clearIdentityScope();
         appdownloadBeanDaoConfig.clearIdentityScope();
+        sheepAdDaoConfig.clearIdentityScope();
         downLoadInfoDaoConfig.clearIdentityScope();
+        searchRecordDaoConfig.clearIdentityScope();
+        accountDaoConfig.clearIdentityScope();
+        sdkLoginUserDaoConfig.clearIdentityScope();
         processRecordDaoConfig.clearIdentityScope();
+        acceptTaskRecordDaoConfig.clearIdentityScope();
         screenShotRecordDaoConfig.clearIdentityScope();
-        sdkLoginUserDaoConfig.clearIdentityScope();
-        searchRecordDaoConfig.clearIdentityScope();
-        sheepAdDaoConfig.clearIdentityScope();
-    }
-
-    public AcceptTaskRecordDao getAcceptTaskRecordDao() {
-        return acceptTaskRecordDao;
-    }
-
-    public AccountDao getAccountDao() {
-        return accountDao;
     }
 
     public AppdownloadBeanDao getAppdownloadBeanDao() {
         return appdownloadBeanDao;
     }
 
+    public SheepAdDao getSheepAdDao() {
+        return sheepAdDao;
+    }
+
     public DownLoadInfoDao getDownLoadInfoDao() {
         return downLoadInfoDao;
     }
 
-    public ProcessRecordDao getProcessRecordDao() {
-        return processRecordDao;
+    public SearchRecordDao getSearchRecordDao() {
+        return searchRecordDao;
     }
 
-    public ScreenShotRecordDao getScreenShotRecordDao() {
-        return screenShotRecordDao;
+    public AccountDao getAccountDao() {
+        return accountDao;
     }
 
     public SdkLoginUserDao getSdkLoginUserDao() {
         return sdkLoginUserDao;
     }
 
-    public SearchRecordDao getSearchRecordDao() {
-        return searchRecordDao;
+    public ProcessRecordDao getProcessRecordDao() {
+        return processRecordDao;
     }
 
-    public SheepAdDao getSheepAdDao() {
-        return sheepAdDao;
+    public AcceptTaskRecordDao getAcceptTaskRecordDao() {
+        return acceptTaskRecordDao;
+    }
+
+    public ScreenShotRecordDao getScreenShotRecordDao() {
+        return screenShotRecordDao;
     }
 
 }

app/src/main/java/com/sheep/gamegroup/module/webview/fragment/FgtWebX5.java

@@ -13,7 +13,7 @@ import android.provider.MediaStore;
 import android.support.v7.app.ActionBar;
 import android.support.v7.app.AlertDialog;
 import android.text.TextUtils;
-import android.view.MotionEvent;
+import android.util.DisplayMetrics;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.animation.Animation;
@@ -181,10 +181,29 @@ public class FgtWebX5 extends BaseFgtWebX5 {
         webSetting.setJavaScriptEnabled(true);
         webSetting.setJavaScriptCanOpenWindowsAutomatically(true);
         webSetting.setAllowFileAccess(true);
-        webSetting.setLayoutAlgorithm(WebSettings.LayoutAlgorithm.NARROW_COLUMNS);
+        //webSetting.setLayoutAlgorithm(WebSettings.LayoutAlgorithm.NARROW_COLUMNS);
+        //自适应屏幕
+        WebSettings.ZoomDensity zoomDensity = WebSettings.ZoomDensity.MEDIUM;
+        switch (SheepApp.getInstance().screenDensity) {
+            case DisplayMetrics.DENSITY_LOW:
+                zoomDensity = WebSettings.ZoomDensity.CLOSE;
+                break;
+            case DisplayMetrics.DENSITY_MEDIUM:
+                zoomDensity = WebSettings.ZoomDensity.MEDIUM;
+                break;
+            case DisplayMetrics.DENSITY_HIGH:
+                zoomDensity = WebSettings.ZoomDensity.FAR;
+                break;
+        }
+        webSetting.setDefaultZoom(zoomDensity);
+        /*webSetting.setLayoutAlgorithm(WebSettings.LayoutAlgorithm.SINGLE_COLUMN);
+        webSetting.setLoadWithOverviewMode(true);
+        webSetting.setTextZoom(100);
+        webSetting.setUseWideViewPort(true);
+        webSetting.setSupportZoom(false);*/
 //        webSetting.setSupportZoom(true);
 //        webSetting.setBuiltInZoomControls(true);
-        webSetting.setUseWideViewPort(true);
+
         webSetting.setSupportMultipleWindows(true);
         // webSetting.setLoadWithOverviewMode(true);
         webSetting.setAppCacheEnabled(true);
@@ -196,6 +215,7 @@ public class FgtWebX5 extends BaseFgtWebX5 {
         webSetting.setPluginState(WebSettings.PluginState.ON_DEMAND);
         // webSetting.setRenderPriority(WebSettings.RenderPriority.HIGH);
 //        webSetting.setCacheMode(NetUtil.CAN_CONNECT_SERVICE ? WebSettings.LOAD_DEFAULT : WebSettings.LOAD_CACHE_ELSE_NETWORK);
+
         if (TestUtil.isDev()) {
             webSetting.setCacheMode(WebSettings.LOAD_NO_CACHE);
         }

app/src/main/java/com/sheep/gamegroup/util/ConnectAddress.java

@@ -17,7 +17,7 @@ public enum ConnectAddress {
 //        public String getAppUrl() {
 //            return "http://10.8.220.237:8010/";
 //        }
-//        @Override
+//        @OverridewebSetting.setUseWideViewPort(true);
 //        public String getName() {
 //            return "党勇锋";
 //        }

app/src/main/java/com/sheep/gamegroup/view/activity/ActMyFocus.java

@@ -52,14 +52,13 @@ public class ActMyFocus extends BaseActivity {
 
     }
 
-
     @Override
     public void initData() {
         mAdapter = new TitleFragmentListAdapter(getSupportFragmentManager());
-        mAdapter.add(getWebFragment(new WebParams(Config.getYFShopUrl(Config.PATH_YF_SHOP_FOCUS) + "&only=1&Authorization=" + SpUtils.getToken(this)).hideProgress()), "有范");
-        mAdapter.add(getWebFragment(new WebParams(Config.getUrlByPath(Config.PATH_YY_SHOP_FOCUS) + "?only=1").hideProgress()), "遇见");
         mAdapter.add(new FgtGameFocusList(), "游戏");
         mAdapter.add(new FgtUserFocusLogList(), "人员");
+        mAdapter.add(getWebFragment(new WebParams(Config.getYFShopUrl(Config.PATH_YF_SHOP_FOCUS) + "&a=collectionlist&Authorization=" + SpUtils.getToken(this)).hideProgress()), "有范");
+        mAdapter.add(getWebFragment(new WebParams(Config.getUrlByPath(Config.PATH_YY_SHOP_FOCUS) + "?only=1").hideProgress()), "遇见");
         pager.setAdapter(mAdapter);
         indicator.setupWithViewPager(pager);
         pager.setCurrentItem(0);
@@ -71,4 +70,10 @@ public class ActMyFocus extends BaseActivity {
         params.setShowTitle(false);
         return ViewUtil.newWebFragment(params);
     }
+
+    @Override
+    public void onBackPressed() {
+        super.onBackPressed();
+        finish();
+    }
 }

app/src/main/java/com/sheep/gamegroup/view/activity/ActWebX5.java

@@ -78,20 +78,17 @@ public class ActWebX5 extends BaseContainerActivity implements UMShareListener {
 
     @Override
     public void finish() {
-        runOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                if (fragment instanceof IWeb && (orientPara == ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE || orientPara == ActivityInfo.SCREEN_ORIENTATION_REVERSE_LANDSCAPE)) {
-                    IWeb webFragment = (IWeb) fragment;
-                    String url = webFragment.getWebUrl();
-                    if (!TextUtils.isEmpty(url) && (url.contains(Config.PATH_DIRECTIONAL_RECHARGE)
-                            || url.contains(Config.PATH_DIRECTIONAL_MAKEGOLD))) {
-                        Log.e("WebRecharge", "execute orient ");
-                        setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
-                    }
+        runOnUiThread(() -> {
+            if (fragment instanceof IWeb && (orientPara == ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE || orientPara == ActivityInfo.SCREEN_ORIENTATION_REVERSE_LANDSCAPE)) {
+                IWeb webFragment = (IWeb) fragment;
+                String url = webFragment.getWebUrl();
+                if (!TextUtils.isEmpty(url) && (url.contains(Config.PATH_DIRECTIONAL_RECHARGE)
+                        || url.contains(Config.PATH_DIRECTIONAL_MAKEGOLD))) {
+                    Log.e("WebRecharge", "execute orient ");
+                    setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
                 }
-                ActWebX5.super.finish();
             }
+            ActWebX5.super.finish();
         });
     }
 

app/src/main/java/com/sheep/gamegroup/view/activity/GameTaskOrderListAct.java

@@ -82,7 +82,7 @@ public class GameTaskOrderListAct extends BaseActivity {
     public void initData() {
         mAdapter = new TitleFragmentListAdapter(getSupportFragmentManager());
         mAdapter.add(getWebFragment(new WebParams(Config.getUrlByPath(Config.PATH_YY_SHOP_ORDER) + "?only=1").hideProgress()), "遇见预约");
-        mAdapter.add(getWebFragment(new WebParams(Config.getYFShopUrl(Config.PATH_YF_SHOP_ORDER) + "&only=1&Authorization=" + SpUtils.getToken(this)).hideProgress()), "有范订单");
+        mAdapter.add(getWebFragment(new WebParams(Config.getYFShopUrl(Config.PATH_YF_SHOP_ORDER) + "&c=order&status=0&Authorization=" + SpUtils.getToken(this)).hideProgress()), "有范订单");
 //        mAdapter.add(new FgtGameTaskOrderList(), "其他订单");
         pager.setAdapter(mAdapter);
         indicator.setupWithViewPager(pager);

app/src/main/java/com/sheep/jiuyan/samllsheep/Config.java

@@ -20,9 +20,9 @@ public class Config {
     public final static String YF_SHOP_HOME_SHEEP_TEST = "http://t.shop.17xmy.com/mobile/?pf=android.sheep.app";//小绵羊加载的有范商城主页地址
     public static final String YF_SHOP_ORDER_NUMBER_KEY = "order_number";
     public static final String YF_SHOP_ORDER_REDIRECT_URL = "redirect_url";
-    public final static String PATH_YF_SHOP_ORDER = "user.php?act=order_list";
-    public final static String PATH_YF_SHOP_CART = "flow.php";
-    public final static String PATH_YF_SHOP_FOCUS = "user.php?act=collection_list";
+    public final static String PATH_YF_SHOP_ORDER = "index.php?m=user";
+    public final static String PATH_YF_SHOP_CART = "index.php?m=cart";
+    public final static String PATH_YF_SHOP_FOCUS = "index.php?m=user";
     //随便打
     public final static String SBD_NAME = "随便打";
 
@@ -111,9 +111,9 @@ public class Config {
     public static final String PATH_GAME_SHOP_HOME = STATION_GAME_SHOP + "/gameMallHome";
     public static final String PATH_GAME_SHOP_MY_GAME = STATION_GAME_SHOP + "/myGameRole";
     public static final String PATH_GAME_SHOP_GOODS_DETAIL = STATION_GAME_SHOP + "/goodsDetail";
-    //遇见预约
+    //有范
     public static final String PATH_YY_SHOP_FOCUS = STATION_YY_SHOP + "/pages/cart/collection";
-    public static final String PATH_YY_SHOP_CART = STATION_YY_SHOP + "/pages/cart/myCart";
+    public static final String PATH_YY_SHOP_CART = STATION_YY_SHOP + "/pa//myCart";
     public static final String PATH_YY_SHOP_ORDER = STATION_YY_SHOP + "/pages/order/order";
     public static final String PATH_YY_SHOP_INDEX = STATION_YY_SHOP + "/pages/index/index";
     //赏金福利
@@ -133,7 +133,7 @@ public class Config {
     //small_station地址
     public static String SMALL_STATION_URL_SHEEP = "http://smallstation.9yan.io";
     public static String SMALL_STATION_URL_TEST = "http://10.8.230.28:8080";
-//    public static String SMALL_STATION_URL_TEST = "http://10.8.240.180:8080";
+    //    public static String SMALL_STATION_URL_TEST = "http://10.8.240.180:8080";
     //在数据库中表 config 中 配置 small_station_url后，可以进行设置 ,否则使用默认的值
     public static String SMALL_STATION_URL;
 
@@ -147,7 +147,7 @@ public class Config {
     }
 
     public static String getYFShopUrl(String sub) {
-        String url = TextUtils.equals(SheepApp.getInstance().getConnectAddress().name(), "sheep") ? "http://shop.17xmy.com/mobile/" : "http://t.shop.17xmy.com/mobile/";
+        String url = TextUtils.equals(SheepApp.getInstance().getConnectAddress().name(), "sheep") ? "http://shop.17xmy.com/mobile/pa/mobile/" : "http://shop.17xmy.com/mobile/pa/mobile/";
         url += sub + (sub.indexOf("?") < 0 ? "?" : "&") + "pf=android.sheep.app";
         return url;
     }
@@ -167,7 +167,7 @@ public class Config {
         return url;
     }
 
-//    public static final String WX_AUTH_APP_ID = "wx2be7f59bb7bb963f";
+    //    public static final String WX_AUTH_APP_ID = "wx2be7f59bb7bb963f";
     public static final String WX_PAY_APP_ID = "wx6ec1ec1732a9cfc0";
     public static final String WX_AUTH_APP_ID = "wx2be7f59bb7bb963f";
     public static final String WX_AUTH_APP_SECRET = "6cf7ca0f6c6ac97c6961d901fee8adb9";

app/src/main/java/com/sheep/jiuyan/samllsheep/SheepApp.java

@@ -96,6 +96,8 @@ public class SheepApp extends MultiDexApplication {
     public ConnectAddress connectAddress;
     private WeakReference<Activity> activityRef;
 
+    public int screenDensity;
+
     private NetComponent netComponent;
     private boolean isShowQB;
     private boolean isInitMidong = false;
@@ -247,17 +249,8 @@ public class SheepApp extends MultiDexApplication {
                 激励视频广告位id：30113
             * */
 
-            //游可赢广告SDK接入
-            int appId;
-            if (BuildConfig.FLAVOR.equals("sheep")) {
-                //正式服
-                //appId = 30051;
-                appId = 30051;
-            } else {
-                //测试服
-                appId = 30051;
-            }
 
+            screenDensity = getResources().getDisplayMetrics().densityDpi;
 
 
 

app/src/main/res/layout/act_my_money.xml

@@ -260,6 +260,7 @@
                         <LinearLayout
                             android:id="@+id/my_money_mall_coupon_tag"
                             style="@style/style_item_container"
+                            android:visibility="gone"
                             android:background="@color/white">
 
                             <TextView

app/src/main/res/layout/fgt_personalcenter_item_center_one.xml

@@ -231,7 +231,7 @@
 
         <TextView
             style="@style/style_item_label"
-            android:text="订单管理" />
+            android:text="商城订单" />
 
         <TextView
             style="@style/style_item_end_next"