Explorar o código

可以通过搜索界面输入产品名字来切换小绵羊服务器;清理多余资源;修复邀请界面无数据时的bug

zengjiebin %!s(int64=8) %!d(string=hai) anos
pai
achega
57eeebbff1
Modificáronse 29 ficheiros con 62 adicións e 455 borrados
  1. 0 3
      app/build.gradle
  2. 3 0
      app/src/main/java/com/kfzs/duanduan/ActSearch.java
  3. 13 8
      app/src/main/java/com/kfzs/duanduan/fragment/FgtFriendExtractPage.java
  4. 0 112
      app/src/main/java/com/kfzs/duanduan/fragment/KFDialogFragment.java
  5. 2 1
      app/src/main/java/com/sheep/gamegroup/di/modules/NetModule.java
  6. 20 6
      app/src/main/java/com/sheep/gamegroup/util/ConnectAddress.java
  7. 1 1
      app/src/main/java/com/sheep/gamegroup/view/adapter/NewbieTaskAdp.java
  8. 23 1
      app/src/main/java/com/sheep/jiuyan/samllsheep/SheepApp.java
  9. 0 0
      app/src/main/res/drawable-hdpi/understand_small_bg.jpg
  10. BIN=BIN
      app/src/main/res/drawable-xxxhdpi/about_icon.png
  11. BIN=BIN
      app/src/main/res/drawable-xxxhdpi/btn_download_manager.png
  12. BIN=BIN
      app/src/main/res/drawable-xxxhdpi/fangdajing.png
  13. BIN=BIN
      app/src/main/res/drawable-xxxhdpi/feedback_icon.png
  14. BIN=BIN
      app/src/main/res/drawable-xxxhdpi/gameid_icon.png
  15. BIN=BIN
      app/src/main/res/drawable-xxxhdpi/gerenzhongxin.png
  16. BIN=BIN
      app/src/main/res/drawable-xxxhdpi/ic_right_sword_select.png
  17. BIN=BIN
      app/src/main/res/drawable-xxxhdpi/left_arrow.png
  18. BIN=BIN
      app/src/main/res/drawable-xxxhdpi/order_icon.png
  19. BIN=BIN
      app/src/main/res/drawable-xxxhdpi/paycoins_icon.png
  20. BIN=BIN
      app/src/main/res/drawable-xxxhdpi/reservation_icon.png
  21. BIN=BIN
      app/src/main/res/drawable-xxxhdpi/reward_icon.png
  22. BIN=BIN
      app/src/main/res/drawable-xxxhdpi/sell_icon.png
  23. BIN=BIN
      app/src/main/res/drawable-xxxhdpi/sellercenter_icon.png
  24. BIN=BIN
      app/src/main/res/drawable-xxxhdpi/update_bg.png
  25. BIN=BIN
      app/src/main/res/drawable-xxxhdpi/wallet_icon.png
  26. BIN=BIN
      app/src/main/res/drawable-xxxhdpi/yuyuetips1.png
  27. BIN=BIN
      app/src/main/res/drawable-xxxhdpi/yuyuetips3.png
  28. 0 264
      app/src/main/res/layout/activity_gift.xml
  29. 0 59
      app/src/main/res/layout/diag_show_appointment.xml

+ 0 - 3
app/build.gradle

@@ -76,7 +76,6 @@ android {
             buildConfigField "String", "DUANDUAN_GRAPH", '"sheeptest"'
             buildConfigField "boolean", "XXTEA_ENCRYPT", 'true'//false为不用加密
             buildConfigField "String", "API_DOMAIN", '"test.bdmapp.kfzs.com"'
-            buildConfigField "String", "APP_URL", '"http://10.8.210.171:8080/"'//张伟
             buildConfigField "String", "JFSC_DOMAIN", '"http://10.8.210.190:8080/"'//积分商城
             buildConfigField "String", "CAPTCHA_DOMAIN", '"captcha.kuaifazs.com"'
             buildConfigField "String", "umeng_appkey", '"58dc9509aed17959a3001bff"'
@@ -93,7 +92,6 @@ android {
             buildConfigField "String", "DUANDUAN_GRAPH", '"sheeptest"'
             buildConfigField "boolean", "XXTEA_ENCRYPT", 'true'
             buildConfigField "String", "API_DOMAIN", '"test.bdmapp.kfzs.com"'
-            buildConfigField "String", "APP_URL", '"http://test.sheep.kfzs.com/"'
             buildConfigField "String", "JFSC_DOMAIN", '"http://10.8.210.190:8080/"'//积分商城
             buildConfigField "String", "CAPTCHA_DOMAIN", '"captcha.kuaifazs.com"'
             buildConfigField "String", "umeng_appkey", '"58dc9509aed17959a3001bff"'
@@ -110,7 +108,6 @@ android {
             buildConfigField "String", "DUANDUAN_GRAPH", '"sheep"'
             buildConfigField "boolean", "XXTEA_ENCRYPT", 'true'
             buildConfigField "String", "API_DOMAIN", '"app.bandai.yunduanzs.cn"'
-            buildConfigField "String", "APP_URL", '"http://ss.kfzs.com/"'
             buildConfigField "String", "JFSC_DOMAIN", '"http://jf.bandaimi.com/"'//积分商城
             buildConfigField "String", "CAPTCHA_DOMAIN", '"captcha.kuaifazs.com"'
             buildConfigField "String", "umeng_appkey", '"58dc9509aed17959a3001bff"'

+ 3 - 0
app/src/main/java/com/kfzs/duanduan/ActSearch.java

@@ -54,9 +54,11 @@ import com.kfzs.duanduan.adp.AdpSearchGame;
 import com.kfzs.duanduan.adp.AdpSearchRecord;
 import com.kfzs.duanduan.adp.AdpSearchViewPager;
 import com.orhanobut.logger.Logger;
+import com.sheep.gamegroup.util.ConnectAddress;
 import com.sheep.gamegroup.util.UMConfigUtils;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
+import com.sheep.jiuyan.samllsheep.utils.G;
 import com.umeng.analytics.MobclickAgent;
 
 import org.greenrobot.eventbus.EventBus;
@@ -324,6 +326,7 @@ public class ActSearch extends BaseCompatActivity {
                     showRecord(true);
                     return;
                 }
+                SheepApp.getInstance().setConnectAddress(ActSearch.this, mEdtKeyWord.getText().toString());
             }
         });
 

+ 13 - 8
app/src/main/java/com/kfzs/duanduan/fragment/FgtFriendExtractPage.java

@@ -87,15 +87,20 @@ public class FgtFriendExtractPage extends BaseFragment {
                     @Override
                     public void onNext(BaseMessage baseMessage) {
                         List<Friend> friendList = baseMessage.getDatas(Friend.class);
-                        Activity activity = getActivity();
-                        if(activity instanceof AskGetMoneyAct){
-                            ((AskGetMoneyAct) activity).setFriendExtractCount(baseMessage.getTotal(), page, friendList.size());
+                        if(friendList == null) {
+                            baseMessage.setMsg("您还没有邀请到好友");
+                            onError(baseMessage);
+                        } else {
+                            Activity activity = getActivity();
+                            if (activity instanceof AskGetMoneyAct) {
+                                ((AskGetMoneyAct) activity).setFriendExtractCount(baseMessage.getTotal(), page, friendList.size());
+                            }
+                            list.addAll(friendList);
+                            notifyDataSetChanged();
+                            if (BuildConfig.DEBUG)
+                                System.out.println("baseMessage onNext " + JSON.toJSONString(baseMessage));
+                            isLoadding = false;
                         }
-                        list.addAll(friendList);
-                        notifyDataSetChanged();
-                        if(BuildConfig.DEBUG)
-                            System.out.println("baseMessage onNext "+JSON.toJSONString(baseMessage));
-                        isLoadding = false;
                     }
 
                     @Override

+ 0 - 112
app/src/main/java/com/kfzs/duanduan/fragment/KFDialogFragment.java

@@ -1,112 +0,0 @@
-package com.kfzs.duanduan.fragment;
-
-import android.app.AlertDialog;
-import android.app.Dialog;
-import android.content.DialogInterface;
-import android.database.Cursor;
-import android.graphics.Point;
-import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v4.app.DialogFragment;
-import android.view.KeyEvent;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.Window;
-import android.view.WindowManager;
-
-import com.sheep.jiuyan.samllsheep.R;
-import com.kfzs.duanduan.utils.dlg.HandlerUtils;
-
-
-/**
- * @ Created by Dlg
- * @ <p>TiTle:  KFDialogFragment</p>
- * @ <p>Description: 更新对话框的相关类,此类基本已废,已经用DialogUpdateFragment替代</p>
- * @ date:  2017/6/8 13:58
- * @ QQ:    315096953
- */
-public class KFDialogFragment extends DialogFragment {
-
-    private HandlerUtils mHandlerUtils;//循环更新进度条
-    private Cursor mCurrentTask;//当前任务的详情
-
-
-    @NonNull
-    @Override
-    public Dialog onCreateDialog(Bundle savedInstanceState) {
-        AlertDialog dialog = new AlertDialog.Builder(getActivity())
-                .setView(getDiagView())
-                .setCancelable(false)
-                .setOnKeyListener(new DialogInterface.OnKeyListener() {
-                    @Override
-                    public boolean onKey(DialogInterface dialog, int keyCode, KeyEvent event) {
-                        return keyCode == KeyEvent.KEYCODE_BACK;
-                    }
-                })
-                .create();
-
-        //禁止点空白地址关闭窗口
-        dialog.setCanceledOnTouchOutside(false);
-        //对话框消失时操作
-        dialog.setOnDismissListener(new DialogInterface.OnDismissListener() {
-            @Override
-            public void onDismiss(DialogInterface dialog) {
-                closeDownTask();
-            }
-        });
-        return dialog;
-    }
-
-    /**
-     * 关闭下载
-     */
-    private void closeDownTask() {
-        mHandlerUtils.setmIsBreak(true);
-        mCurrentTask.close();
-        getActivity().finish();
-    }
-
-    /**
-     * 初始化处理对话框组件值
-     *
-     * @return 返回对话框界面
-     */
-    private View getDiagView() {
-        View view = LayoutInflater.from(getActivity())
-                .inflate(R.layout.diag_show_appointment, null);
-        view.findViewById(R.id.btn_diag_show_appointment).setOnClickListener(clsMain);
-        return view;
-    }
-
-
-    /**
-     * 设置对话框的宽和高,此方案小米等手机可能是不兼容的。
-     */
-    @Override
-    public void onResume() {
-        super.onResume();
-        Window dialogWindow = getDialog().getWindow();
-        Point point = new Point();
-        getActivity().getWindowManager().getDefaultDisplay().getSize(point);
-        WindowManager.LayoutParams p = dialogWindow.getAttributes();
-        //p.height = (int) (point.y * (mIsUpdateDiag ? 0.65 : 0.4));
-        p.width = (int) (point.x * 0.8);
-        dialogWindow.setAttributes(p);
-    }
-
-
-    /**
-     * 对话框的监听
-     */
-    private View.OnClickListener clsMain = new View.OnClickListener() {
-        @Override
-        public void onClick(View v) {
-            switch (v.getId()) {
-                case R.id.btn_diag_show_appointment:
-                    KFDialogFragment.this.dismiss();
-                    break;
-            }
-        }
-    };
-
-}

+ 2 - 1
app/src/main/java/com/sheep/gamegroup/di/modules/NetModule.java

@@ -6,6 +6,7 @@ import com.sheep.gamegroup.model.util.AddPuplicParameIntercept;
 import com.sheep.gamegroup.model.util.EntityUtils;
 import com.sheep.gamegroup.util.ConnectAddress;
 import com.sheep.jiuyan.samllsheep.BuildConfig;
+import com.sheep.jiuyan.samllsheep.SheepApp;
 
 import java.util.concurrent.TimeUnit;
 
@@ -44,7 +45,7 @@ public class NetModule {
     public Retrofit provideRetrofit(OkHttpClient okhttpClient) {
         Retrofit retrofit = new Retrofit.Builder()
                 .client(okhttpClient)
-                .baseUrl(ConnectAddress.APP_URL)
+                .baseUrl(SheepApp.getInstance().getConnectAddress().getAppUrl()+"v1/")
                 .addConverterFactory(StringConverterFactory.create())
                 .addConverterFactory(GsonConverterFactory.create(EntityUtils.gson))//
                 .addCallAdapterFactory(RxJavaCallAdapterFactory.create())

+ 20 - 6
app/src/main/java/com/sheep/gamegroup/util/ConnectAddress.java

@@ -1,16 +1,30 @@
 package com.sheep.gamegroup.util;
 
-import com.sheep.jiuyan.samllsheep.BuildConfig;
 
 /**
  * Created by ljy on 2018/3/15.
  */
 
-public class ConnectAddress {
+public enum ConnectAddress {
+    sheepzhangwei {
 
-    /**
-     * 接口地址
-     */
-    public static final String APP_URL = BuildConfig.APP_URL+"v1/";
+        @Override
+        public String getAppUrl() {
+            return "http://10.8.210.171:8080/";
+        }
+    },sheeptest {
+
+        @Override
+        public String getAppUrl() {
+            return "http://test.sheep.kfzs.com/";
+        }
+    },sheep {
+
+        @Override
+        public String getAppUrl() {
+            return "http://ss.kfzs.com/";
+        }
+    };
+    public abstract String getAppUrl();
 
 }

+ 1 - 1
app/src/main/java/com/sheep/gamegroup/view/adapter/NewbieTaskAdp.java

@@ -52,7 +52,7 @@ public class NewbieTaskAdp extends BaseAdapter {
     public long getItemId(int position) {
         return 0;
     }
-    private final static int[] ids = {R.drawable.newbie_task_1, R.drawable.newbie_task_2, R.drawable.newbie_task_3, R.drawable.newbie_task_4, R.drawable.newbie_task_5, R.drawable.newbie_task_6};
+    private final static int[] ids = {R.drawable.newbie_task_2, R.drawable.newbie_task_3, R.drawable.newbie_task_4, R.drawable.newbie_task_5, R.drawable.newbie_task_1, R.drawable.newbie_task_6};
     @Override
     public View getView(final int position, View convertView, ViewGroup parent) {
         Object tag = convertView == null ? null : convertView.getTag();

+ 23 - 1
app/src/main/java/com/sheep/jiuyan/samllsheep/SheepApp.java

@@ -6,14 +6,20 @@ import android.os.Bundle;
 import android.support.multidex.MultiDex;
 import android.util.DisplayMetrics;
 
+import com.kfzs.duanduan.react.SharedPreferences;
 import com.kfzs.libs.di.http.DaggerHttpComponent;
 import com.kfzs.libs.di.http.HttpComponent;
 import com.kfzs.libs.di.http.HttpModule;
 import com.sheep.gamegroup.di.components.DaggerNetComponent;
 import com.sheep.gamegroup.di.components.NetComponent;
 import com.sheep.gamegroup.di.modules.NetModule;
+import com.sheep.gamegroup.util.ActivityManager;
+import com.sheep.gamegroup.util.ConnectAddress;
+import com.sheep.gamegroup.util.Jump2View;
 import com.sheep.gamegroup.util.UMConfigUtils;
+import com.sheep.gamegroup.view.activity.AccountAndSecurityAct;
 import com.sheep.jiuyan.samllsheep.utils.G;
+import com.sheep.jiuyan.samllsheep.utils.SpUtils;
 import com.tencent.bugly.Bugly;
 import com.tencent.mm.opensdk.openapi.IWXAPI;
 
@@ -30,6 +36,7 @@ public class SheepApp extends BaseApplication {
     public static Context mContext;
     public static IWXAPI mWxapi;
     public static SheepApp mSheepApp;
+    public ConnectAddress connectAddress;
 
     public static Map<String, Activity> mActivitys;
 
@@ -42,12 +49,27 @@ public class SheepApp extends BaseApplication {
         return (SheepApp) context.getApplicationContext();
     }
 
-    
+    public ConnectAddress getConnectAddress() {
+        return connectAddress;
+    }
+
+    public void setConnectAddress(Activity activity, String flavor) {
+        try {
+            connectAddress = ConnectAddress.valueOf(flavor);
+            SharedPreferences.getInstance().putString("flavor", flavor);
+            quit();
+        } catch (IllegalArgumentException e) {
+            e.printStackTrace();
+        }
+    }
+
     @Override
     public void onCreate() {
         super.onCreate();
         mContext = getApplicationContext();
         mSheepApp = this;
+        String flavor = SharedPreferences.getInstance().getString("flavor",BuildConfig.FLAVOR);
+        connectAddress = ConnectAddress.valueOf(flavor);
         regWx();
         registerActivityLifecycleCallbacks(activityLifecycleCallbacks);
         initGoble();

app/src/main/res/drawable-xxxhdpi/understand_small_bg.jpg → app/src/main/res/drawable-hdpi/understand_small_bg.jpg


BIN=BIN
app/src/main/res/drawable-xxxhdpi/about_icon.png


BIN=BIN
app/src/main/res/drawable-xxxhdpi/btn_download_manager.png


BIN=BIN
app/src/main/res/drawable-xxxhdpi/fangdajing.png


BIN=BIN
app/src/main/res/drawable-xxxhdpi/feedback_icon.png


BIN=BIN
app/src/main/res/drawable-xxxhdpi/gameid_icon.png


BIN=BIN
app/src/main/res/drawable-xxxhdpi/gerenzhongxin.png


BIN=BIN
app/src/main/res/drawable-xxxhdpi/ic_right_sword_select.png


BIN=BIN
app/src/main/res/drawable-xxxhdpi/left_arrow.png


BIN=BIN
app/src/main/res/drawable-xxxhdpi/order_icon.png


BIN=BIN
app/src/main/res/drawable-xxxhdpi/paycoins_icon.png


BIN=BIN
app/src/main/res/drawable-xxxhdpi/reservation_icon.png


BIN=BIN
app/src/main/res/drawable-xxxhdpi/reward_icon.png


BIN=BIN
app/src/main/res/drawable-xxxhdpi/sell_icon.png


BIN=BIN
app/src/main/res/drawable-xxxhdpi/sellercenter_icon.png


BIN=BIN
app/src/main/res/drawable-xxxhdpi/update_bg.png


BIN=BIN
app/src/main/res/drawable-xxxhdpi/wallet_icon.png


BIN=BIN
app/src/main/res/drawable-xxxhdpi/yuyuetips1.png


BIN=BIN
app/src/main/res/drawable-xxxhdpi/yuyuetips3.png


+ 0 - 264
app/src/main/res/layout/activity_gift.xml

@@ -1,264 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/white"
-    android:fitsSystemWindows="true">
-
-    <LinearLayout
-        android:id="@+id/dingwei1"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/app_title_heigh"
-        android:background="?attr/main_color"
-        android:gravity="center_vertical"
-        android:orientation="horizontal">
-
-        <ImageButton
-            android:id="@+id/ibtn_act_webview"
-            android:layout_width="@dimen/app_title_heigh"
-            android:layout_height="@dimen/app_title_heigh"
-            android:layout_alignParentLeft="true"
-            android:background="@null"
-            android:src="@drawable/left_arrow" />
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:gravity="center_vertical"
-            android:text="礼包详情"
-            android:textColor="@color/white"
-            android:textSize="@dimen/app_size_tv_ordinary" />
-    </LinearLayout>
-
-    <ScrollView
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_below="@id/dingwei1"
-        android:layout_marginBottom="60dp">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:orientation="vertical">
-
-            <RelativeLayout
-                android:id="@+id/layout_activity_gift_title"
-                android:layout_width="match_parent"
-                android:layout_height="96dp"
-                android:gravity="center_vertical"
-                android:paddingLeft="10dp">
-
-                <ImageView
-                    android:id="@+id/img_activity_gift"
-                    android:layout_width="@dimen/app_vertical_margin_huge"
-                    android:layout_height="@dimen/app_vertical_margin_huge"
-                    android:layout_marginRight="16dp" />
-
-                <ImageView
-                    android:id="@+id/img_activity_icon"
-                    android:layout_width="@dimen/app_logo_icon"
-                    android:layout_height="@dimen/app_logo_icon"
-                    android:layout_alignRight="@id/img_activity_gift" />
-
-                <TextView
-                    android:id="@+id/txt_activity_gift_title"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_toRightOf="@id/img_activity_gift"
-                    android:maxLines="1"
-                    android:text="游戏名"
-                    android:textColor="@color/comment_title"
-                    android:textSize="@dimen/app_size_tv_ordinary" />
-
-                <TextView
-                    android:id="@+id/txt_activity_gift_number"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_below="@+id/txt_activity_gift_title"
-                    android:layout_toEndOf="@+id/img_activity_gift"
-                    android:layout_toRightOf="@+id/img_activity_gift"
-                    android:text="@string/gift_get_number"
-                    android:textColor="@color/black_50_alpha"
-                    android:textSize="@dimen/app_size_tv_mic" />
-
-                <RelativeLayout
-                    android:id="@+id/layout_activity_gift_head"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_alignLeft="@id/txt_activity_gift_title"
-                    android:layout_below="@id/txt_activity_gift_number"
-                    android:layout_marginTop="4dp"
-                    android:layout_toRightOf="@id/img_activity_gift"
-                    android:visibility="visible">
-
-                    <TextView
-                        android:id="@+id/txt_activity_gift_remain"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="@string/gift_get_remain"
-                        android:textColor="@color/black_50_alpha"
-                        android:textSize="@dimen/app_size_tv_mic" />
-
-                    <ProgressBar
-                        android:id="@+id/view_activity_gift_progress"
-                        style="@style/style_progress"
-                        android:layout_width="150dp"
-                        android:layout_height="8dp"
-                        android:layout_below="@id/txt_activity_gift_remain"
-                        android:layout_gravity="center_vertical"
-                        android:layout_marginTop="6dp"
-                        android:max="100" />
-
-
-                    <TextView
-                        android:id="@+id/txt_activity_gift_progress"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_alignTop="@id/view_activity_gift_progress"
-                        android:layout_marginLeft="6dp"
-                        android:layout_toRightOf="@id/view_activity_gift_progress"
-                        android:text="0%"
-                        android:textColor="@color/black_50_alpha"
-                        android:textSize="@dimen/app_size_tv_mic" />
-                </RelativeLayout>
-
-                <TextView
-                    android:id="@+id/txt_activity_gift_code"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_alignLeft="@id/txt_activity_gift_title"
-                    android:layout_below="@id/txt_activity_gift_number"
-                    android:layout_marginTop="4dp"
-                    android:layout_toRightOf="@id/img_activity_gift"
-                    android:text="激活码:000000"
-                    android:textColor="@color/black_50_alpha"
-                    android:textSize="@dimen/app_size_tv_mic"
-                    android:visibility="gone" />
-            </RelativeLayout>
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:background="@color/comment_replay_bg"
-                android:gravity="center_vertical"
-                android:orientation="horizontal"
-                android:padding="10dp">
-
-                <View
-                    android:layout_width="3dp"
-                    android:layout_height="16dp"
-                    android:background="?attr/main_color" />
-
-                <TextView
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:paddingLeft="10dp"
-                    android:text="@string/gift_get_content"
-                    android:textSize="@dimen/app_size_tv_small" />
-            </LinearLayout>
-
-
-            <TextView
-                android:id="@+id/txt_activity_gift_content"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:lineSpacingExtra="3dp"
-                android:padding="12dp"
-                android:text="礼包内容:\n无"
-                android:textSize="@dimen/app_size_tv_small" />
-
-            <!--用xml画图兼容性真差。。。-->
-            <!--<TextView-->
-            <!--android:layout_width="match_parent"-->
-            <!--android:layout_height="wrap_content"-->
-            <!--android:background="@color/comment_replay_bg"-->
-            <!--android:drawableLeft="@drawable/sp_line_vertical"-->
-            <!--android:drawablePadding="8dp"-->
-            <!--android:padding="8dp"-->
-            <!--android:text="@string/gift_get_time"-->
-            <!--android:textSize="@dimen/app_size_tv_small" />-->
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:background="@color/comment_replay_bg"
-                android:gravity="center_vertical"
-                android:orientation="horizontal"
-                android:padding="10dp">
-
-                <View
-                    android:layout_width="3dp"
-                    android:layout_height="16dp"
-                    android:background="?attr/main_color" />
-
-                <TextView
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:paddingLeft="10dp"
-                    android:text="@string/gift_get_time"
-                    android:textSize="@dimen/app_size_tv_small" />
-            </LinearLayout>
-
-
-            <TextView
-                android:id="@+id/txt_activity_gift_time"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:lineSpacingExtra="3dp"
-                android:padding="12dp"
-                android:text="2017年01月19日 11:00 至 2017年12月31日 17:31"
-                android:textSize="@dimen/app_size_tv_small" />
-
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:background="@color/comment_replay_bg"
-                android:gravity="center_vertical"
-                android:orientation="horizontal"
-                android:padding="10dp">
-
-                <View
-                    android:layout_width="3dp"
-                    android:layout_height="16dp"
-                    android:background="?attr/main_color" />
-
-                <TextView
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:paddingLeft="10dp"
-                    android:text="@string/gift_get_tips"
-                    android:textSize="@dimen/app_size_tv_small" />
-            </LinearLayout>
-
-
-            <TextView
-                android:id="@+id/txt_activity_gift_descp"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:lineSpacingExtra="3dp"
-                android:padding="12dp"
-                android:text="@string/gift_get_desp"
-                android:textSize="@dimen/app_size_tv_small" />
-        </LinearLayout>
-    </ScrollView>
-
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:background="@color/comment_replay_bg"
-        android:padding="12dp">
-
-        <Button
-            android:id="@+id/btn_activity_gift"
-            android:layout_width="match_parent"
-            android:layout_height="44dp"
-            android:layout_marginLeft="10dp"
-            android:layout_marginRight="10dp"
-            android:background="@drawable/progress_button_full_green"
-            android:text="领取"
-            android:textColor="@color/white" />
-
-    </LinearLayout>
-</RelativeLayout>

+ 0 - 59
app/src/main/res/layout/diag_show_appointment.xml

@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:background="@color/transparent"
-    android:layout_height="match_parent">
-
-    <RelativeLayout
-        android:layout_width="280dp"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:background="@drawable/sp_appointment_bg"
-        android:gravity="center_vertical">
-
-        <ImageView
-            android:id="@+id/img_diag_show_appointment"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerHorizontal="true"
-            android:layout_marginLeft="4dp"
-            android:layout_marginTop="30dp"
-            android:src="@drawable/yuyuetips1" />
-
-        <TextView
-            android:id="@+id/txt_diag_show_appointment_tips"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/img_diag_show_appointment"
-            android:layout_centerHorizontal="true"
-            android:layout_marginTop="20dp"
-            android:text="@string/book_succ"
-            android:textColor="?attr/main_color"
-            android:textSize="@dimen/app_size_tv_large" />
-
-        <TextView
-            android:id="@+id/txt_diag_show_appointment_content"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/txt_diag_show_appointment_tips"
-            android:layout_centerHorizontal="true"
-            android:layout_marginTop="40dp"
-            android:gravity="center"
-            android:text="预约即有机会获得预约的福利\n请关注个人中心预约游戏"
-            android:textSize="16sp"
-            android:textStyle="bold" />
-
-        <Button
-            android:id="@+id/btn_diag_show_appointment"
-            android:layout_width="140dp"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/txt_diag_show_appointment_content"
-            android:layout_centerHorizontal="true"
-            android:layout_marginBottom="30dp"
-            android:layout_marginTop="40dp"
-            android:background="@drawable/theme_bg_btn_corner_big"
-            android:text="知道了"
-            android:textColor="@color/white"
-            android:textStyle="bold" />
-    </RelativeLayout>
-</FrameLayout>